From 7e8995b0248f828e3940b924a07e6d8c2e2b9d92 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Thu, 27 Aug 2020 23:00:36 +0800
Subject: [PATCH] d

---
 app/build.gradle                              |  16 ++++
 app/july.jks                                  | Bin 0 -> 2049 bytes
 app/release/output.json                       |   1 +
 .../kehu/activity/FpOrderInfoActivity.java    |   3 +-
 .../adapter/FpOrderInfoAdaptertwo.java        |   2 +-
 .../main/kehu/adapter/MarkingTwoAdapter.java  |  46 ----------
 app/src/main/res/layout/dingdan_rv_two.xml    |  82 ++++++++++++++++--
 7 files changed, 95 insertions(+), 55 deletions(-)
 create mode 100644 app/july.jks
 create mode 100644 app/release/output.json
 rename app/src/main/java/com/fenghoo/seven/main/{find => kehu}/adapter/FpOrderInfoAdaptertwo.java (98%)
 delete mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/adapter/MarkingTwoAdapter.java

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 0000000000000000000000000000000000000000..573e7bf781687eba12427aa1cbd85426a796e236
GIT binary patch
literal 2049
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

literal 0
HcmV?d00001

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<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);
-            }
-        });
-    }
-}
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+<RelativeLayout android:layout_width="match_parent"
+    android:layout_height="132dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/bg_gray"
-    android:orientation="vertical"
+    android:background="@color/colorWhite"
     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
         android:id="@+id/item_my_twitter"
         android:layout_width="300dp"
+        android:layout_below="@+id/view2"
+        android:layout_marginTop="20dp"
+        android:layout_centerHorizontal="true"
         android:layout_height="wrap_content"
         app:iv_icon_01="@drawable/shape_pro_yuan"
         app:iv_icon_02="@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>