d
This commit is contained in:
@@ -11,12 +11,28 @@ android {
|
|||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
multiDexEnabled true //突破应用方法数65535的一个限制
|
multiDexEnabled true //突破应用方法数65535的一个限制
|
||||||
}
|
}
|
||||||
|
signingConfigs {
|
||||||
|
release {
|
||||||
|
storeFile file('july.jks')
|
||||||
|
storePassword "july"
|
||||||
|
keyAlias "123456"
|
||||||
|
keyPassword "123456"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lintOptions {
|
||||||
|
checkReleaseBuilds false
|
||||||
|
abortOnError false
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
BIN
app/july.jks
Normal file
BIN
app/july.jks
Normal file
Binary file not shown.
1
app/release/output.json
Normal file
1
app/release/output.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
|
||||||
@@ -8,7 +8,7 @@ import android.widget.TextView;
|
|||||||
import com.fenghoo.seven.JsonUtils;
|
import com.fenghoo.seven.JsonUtils;
|
||||||
import com.fenghoo.seven.R;
|
import com.fenghoo.seven.R;
|
||||||
import com.fenghoo.seven.base.BaseActivity;
|
import com.fenghoo.seven.base.BaseActivity;
|
||||||
import com.fenghoo.seven.main.find.adapter.FpOrderInfoAdaptertwo;
|
import com.fenghoo.seven.main.kehu.adapter.FpOrderInfoAdaptertwo;
|
||||||
import com.fenghoo.seven.main.find.entity.Markquestionsone;
|
import com.fenghoo.seven.main.find.entity.Markquestionsone;
|
||||||
import com.fenghoo.seven.main.find.entity.markquestions;
|
import com.fenghoo.seven.main.find.entity.markquestions;
|
||||||
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
|
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
|
||||||
@@ -16,7 +16,6 @@ import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
|
|||||||
import com.fenghoo.seven.main.kehu.Bean.industryBean;
|
import com.fenghoo.seven.main.kehu.Bean.industryBean;
|
||||||
import com.fenghoo.seven.okgonet.NetApi;
|
import com.fenghoo.seven.okgonet.NetApi;
|
||||||
import com.fenghoo.seven.okgonet.Observer;
|
import com.fenghoo.seven.okgonet.Observer;
|
||||||
import com.fenghoo.seven.widget.CircleImageView;
|
|
||||||
import com.fenghoo.seven.widget.TitleBar;
|
import com.fenghoo.seven.widget.TitleBar;
|
||||||
import com.lzy.okgo.model.Response;
|
import com.lzy.okgo.model.Response;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.fenghoo.seven.main.find.adapter;
|
package com.fenghoo.seven.main.kehu.adapter;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
package com.fenghoo.seven.main.kehu.adapter;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
|
|
||||||
import com.chad.library.adapter.base.BaseQuickAdapter;
|
|
||||||
import com.chad.library.adapter.base.BaseViewHolder;
|
|
||||||
import com.fenghoo.seven.R;
|
|
||||||
import com.fenghoo.seven.main.kehu.Bean.markingYiliushi;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
|
|
||||||
public class MarkingTwoAdapter extends BaseQuickAdapter<markingYiliushi.ResultBean.DataBean, BaseViewHolder> {
|
|
||||||
Context mcontext;
|
|
||||||
public MarkingTwoAdapter(Context context, List list) {
|
|
||||||
super(R.layout.item_custom_lost_sec, list);
|
|
||||||
this.mcontext = context;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void convert(final BaseViewHolder helper, final markingYiliushi.ResultBean.DataBean item) {
|
|
||||||
//姓名
|
|
||||||
if (!TextUtils.isEmpty(item.getFistname()) || !TextUtils.isEmpty(item.getName())) {
|
|
||||||
helper.setText(R.id.tv_user_name_yiliushi, item.getFistname() + item.getName().toString());
|
|
||||||
} else {
|
|
||||||
helper.setText(R.id.tv_user_name_yiliushi, "— —");
|
|
||||||
}
|
|
||||||
//电话
|
|
||||||
|
|
||||||
ImageView iv_user_head_view_yiliushi = (ImageView) helper.getView(R.id.iv_user_head_view_yiliushi);
|
|
||||||
Button btn_customer_exist_state_lost = (Button) helper.getView(R.id.btn_customer_exist_state_lost);
|
|
||||||
iv_user_head_view_yiliushi.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View view) {
|
|
||||||
// Intent intent = new Intent(mContext, PhotoViewActivity.class);
|
|
||||||
// ArrayList<String> strings = new ArrayList<>();
|
|
||||||
// strings.add(item.getVisitor_head_img());
|
|
||||||
// intent.putStringArrayListExtra(PhotoViewActivity.PHOTO_LIST,strings);
|
|
||||||
// mContext.startActivity(intent);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +1,89 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
<LinearLayout android:layout_width="match_parent"
|
<RelativeLayout android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="132dp"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:background="@color/bg_gray"
|
android:background="@color/colorWhite"
|
||||||
android:orientation="vertical"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/view2"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="2dp"
|
||||||
|
android:background="#F5F5F5"
|
||||||
|
/>
|
||||||
<com.fenghoo.seven.widget.ItemProView
|
<com.fenghoo.seven.widget.ItemProView
|
||||||
android:id="@+id/item_my_twitter"
|
android:id="@+id/item_my_twitter"
|
||||||
android:layout_width="300dp"
|
android:layout_width="300dp"
|
||||||
|
android:layout_below="@+id/view2"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:iv_icon_01="@drawable/shape_pro_yuan"
|
app:iv_icon_01="@drawable/shape_pro_yuan"
|
||||||
app:iv_icon_02="@drawable/shape_pro_yuan"
|
app:iv_icon_02="@drawable/shape_pro_yuan"
|
||||||
app:iv_icon_03="@drawable/shape_pro_yuan"
|
app:iv_icon_03="@drawable/shape_pro_yuan"
|
||||||
/>
|
/>
|
||||||
<!-- app:iv_icon_01="@drawable/shape_pro_yuan"-->
|
|
||||||
</LinearLayout>
|
<RelativeLayout
|
||||||
|
android:layout_below="@+id/item_my_twitter"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:layout_height="60dp">
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/rl_01"
|
||||||
|
android:layout_width="130dp"
|
||||||
|
android:layout_height="60dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_time_01"
|
||||||
|
android:layout_width="36dp"
|
||||||
|
android:layout_height="21dp"
|
||||||
|
android:text="12:47"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:textColor="#ff545454"
|
||||||
|
android:textSize="15sp"
|
||||||
|
/>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="63dp"
|
||||||
|
android:layout_height="15dp"
|
||||||
|
android:text="2020-07-01"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_below="@+id/tv_time_01"
|
||||||
|
android:textColor="#ffbfbfbf"
|
||||||
|
android:textSize="11sp"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_toRightOf="@+id/rl_01"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="60dp">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_fphy"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="分配行业:"
|
||||||
|
android:textColor="#ff545454"
|
||||||
|
android:textSize="15sp"
|
||||||
|
/>
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_fpcs"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/tv_fphy"
|
||||||
|
android:text="分配城市:"
|
||||||
|
android:textColor="#ff545454"
|
||||||
|
android:textSize="15sp"
|
||||||
|
/>
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_khys"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/tv_fpcs"
|
||||||
|
android:text="客户预算:"
|
||||||
|
android:textColor="#ff545454"
|
||||||
|
android:textSize="15sp"
|
||||||
|
/>
|
||||||
|
</RelativeLayout>
|
||||||
|
</RelativeLayout>
|
||||||
|
</RelativeLayout>
|
||||||
|
|||||||
Reference in New Issue
Block a user