diff --git a/app/build.gradle b/app/build.gradle index c12a626..d0ee4ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,12 +11,28 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true //突破应用方法数65535的一个限制 } + signingConfigs { + release { + storeFile file('july.jks') + storePassword "july" + keyAlias "123456" + keyPassword "123456" + } + + } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + lintOptions { + checkReleaseBuilds false + abortOnError false + } + + } dependencies { diff --git a/app/july.jks b/app/july.jks new file mode 100644 index 0000000..573e7bf Binary files /dev/null and b/app/july.jks differ diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..c429e31 --- /dev/null +++ b/app/release/output.json @@ -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":{}}] \ No newline at end of file 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 8526f01..eed5e71 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 @@ -8,7 +8,7 @@ import android.widget.TextView; import com.fenghoo.seven.JsonUtils; import com.fenghoo.seven.R; 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.markquestions; 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.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; -import com.fenghoo.seven.widget.CircleImageView; import com.fenghoo.seven.widget.TitleBar; import com.lzy.okgo.model.Response; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdaptertwo.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/FpOrderInfoAdaptertwo.java similarity index 98% rename from app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdaptertwo.java rename to app/src/main/java/com/fenghoo/seven/main/kehu/adapter/FpOrderInfoAdaptertwo.java index 3356c5d..afe8859 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdaptertwo.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/FpOrderInfoAdaptertwo.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.find.adapter; +package com.fenghoo.seven.main.kehu.adapter; import android.content.Context; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/MarkingTwoAdapter.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/MarkingTwoAdapter.java deleted file mode 100644 index 5c69ff9..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/MarkingTwoAdapter.java +++ /dev/null @@ -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 { - 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 strings = new ArrayList<>(); -// strings.add(item.getVisitor_head_img()); -// intent.putStringArrayListExtra(PhotoViewActivity.PHOTO_LIST,strings); -// mContext.startActivity(intent); - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/dingdan_rv_two.xml b/app/src/main/res/layout/dingdan_rv_two.xml index daaaf13..d3e6c5a 100644 --- a/app/src/main/res/layout/dingdan_rv_two.xml +++ b/app/src/main/res/layout/dingdan_rv_two.xml @@ -1,19 +1,89 @@ - + - - + + + + + + + + + + + + + + +