diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..d41a18a Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..b26c6b7 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.android", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java b/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java index fdde0b6..358f436 100644 --- a/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java +++ b/app/src/main/java/com/android/activity/adapter/StaggerAdapter.java @@ -17,6 +17,7 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.android.R; import com.android.bean.Good; import com.bumptech.glide.Glide; +import com.bumptech.glide.load.engine.DiskCacheStrategy; import java.util.ArrayList; import java.util.List; @@ -77,6 +78,8 @@ public class StaggerAdapter extends RecyclerView.Adapter map = new HashMap<>(); +// Map map = new HashMap<>(); goodsModelimpl.getAllGoodsType(this); + Log.e("1",String.valueOf(user.getId())); //发送获取用户交易记录 - goodsModelimpl.getUserRecords(user.getId(),map,this); -// new Handler().postDelayed(new Runnable() { -// @Override -// public void run() { -// initRecyclerview(); -// -// } -// },2000); +// goodsModelimpl.getUserRecords(user.getId(),map,this); } @@ -131,7 +125,7 @@ public class HomePageFragment extends Fragment implements View.OnClickListener, @Override public void onGetUserRecordsSuccess(ResponseData> responseData) { //通过EventBus传输用户的交易记录 - EventBus.getDefault().postSticky(responseData.getData()); +// EventBus.getDefault().postSticky(responseData.getData()); } private void initRecyclerview() { diff --git a/app/src/main/java/com/android/activity/fragment/MessagePageFragment.java b/app/src/main/java/com/android/activity/fragment/MessagePageFragment.java index 0c76044..4fab0f4 100644 --- a/app/src/main/java/com/android/activity/fragment/MessagePageFragment.java +++ b/app/src/main/java/com/android/activity/fragment/MessagePageFragment.java @@ -14,26 +14,35 @@ import android.view.ViewGroup; import com.android.R; import com.android.activity.adapter.UserRecordsAdapter; import com.android.bean.BaseRecords; +import com.android.bean.GoodRecords; +import com.android.bean.GoodsType; import com.android.bean.ResponseData; import com.android.bean.User; import com.android.bean.queryBean.UserGoodsRecords; +import com.android.model.goods.GoodsListener; +import com.android.model.goods.GoodsModelimpl; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * A simple {@link Fragment} subclass. * Use the {@link MessagePageFragment#newInstance} factory method to * create an instance of this fragment. */ -public class MessagePageFragment extends Fragment{ +public class MessagePageFragment extends Fragment implements GoodsListener { BaseRecords recordsData; private View view; private RecyclerView recyclerView; private UserRecordsAdapter userRecordsAdapter; private User user; + private GoodsModelimpl modelimpl; public MessagePageFragment() { @@ -61,11 +70,11 @@ public class MessagePageFragment extends Fragment{ super.onDestroy(); } - //获取用户交易记录 - @Subscribe(threadMode = ThreadMode.MAIN,sticky = true) - public void getUserGoodsRecords(BaseRecords recordsData){ - this.recordsData = recordsData; - } +// //获取用户交易记录 +// @Subscribe(threadMode = ThreadMode.MAIN,sticky = true) +// public void getUserGoodsRecords(BaseRecords recordsData){ +// this.recordsData = recordsData; +// } //获取当前用户信息 @Subscribe(threadMode = ThreadMode.MAIN,sticky = true) @@ -78,9 +87,13 @@ public class MessagePageFragment extends Fragment{ Bundle savedInstanceState) { // Inflate the layout for this fragment view = inflater.inflate(R.layout.fragment_message_page, container, false); - Log.e("MessagePageFragment",recordsData.getSize().toString()); - initView(); + modelimpl = new GoodsModelimpl(); + Log.e("11111",String.valueOf(user.getId())); + Map map = new HashMap<>(); +// map.put("size",10); + modelimpl.getUserRecords(user.getId(),map,this); + return view; } @@ -99,4 +112,22 @@ public class MessagePageFragment extends Fragment{ } } + + @Override + public void onGetAllGoodsType(ResponseData> responseData) { + + } + + @Override + public void onGetAllGoodSuccess(ResponseData responseData) { + + } + + @Override + public void onGetUserRecordsSuccess(ResponseData> recordsData) { + this.recordsData = recordsData.getData(); + Log.e("MessagePageFragment",this.recordsData.getSize().toString()); + + initView(); + } } \ No newline at end of file diff --git a/app/src/main/java/com/android/activity/fragment/PublishProductFragment.java b/app/src/main/java/com/android/activity/fragment/PublishProductFragment.java index 461b8a5..a7044a0 100644 --- a/app/src/main/java/com/android/activity/fragment/PublishProductFragment.java +++ b/app/src/main/java/com/android/activity/fragment/PublishProductFragment.java @@ -137,6 +137,8 @@ public class PublishProductFragment extends Fragment implements View.OnClickList if (imageBean == null){ ToastUtil.showMsg(getActivity(),"请先上传图片"); return; + }else { + ToastUtil.showMsg(getActivity(),"上传图片成功"); } goods.setImageCode(imageBean.getImageCode()); diff --git a/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java b/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java index 57af194..2ed6cd7 100644 --- a/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java +++ b/app/src/main/java/com/android/model/goods/GoodsHttp_interface.java @@ -21,24 +21,24 @@ import retrofit2.http.QueryMap; public interface GoodsHttp_interface { @GET("tran/goods/type") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable>> sendGetAllGoodsType(); @GET("tran/goods/all") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable> sendGetAllGood(@Query("userId") Long userId, @QueryMap Map map ); @GET("tran/trading/buy") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable>> sendUserBuyGoods(@Query("userId") Long userId, @QueryMap Map map); @GET("tran/trading/records") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable>> sendUserRecords(@Query("userId") Long userId, @QueryMap Map map); diff --git a/app/src/main/java/com/android/model/goods/GoodsModelimpl.java b/app/src/main/java/com/android/model/goods/GoodsModelimpl.java index 263f4a1..7c554c6 100644 --- a/app/src/main/java/com/android/model/goods/GoodsModelimpl.java +++ b/app/src/main/java/com/android/model/goods/GoodsModelimpl.java @@ -144,7 +144,6 @@ public class GoodsModelimpl implements GoodsModel{ @Override public void onNext(@NonNull ResponseData> baseRecordsResponseData) { goodsListener.onGetUserRecordsSuccess(baseRecordsResponseData); - } @Override diff --git a/app/src/main/java/com/android/model/login/longinHttp_Interface.java b/app/src/main/java/com/android/model/login/longinHttp_Interface.java index 89013f6..24421d1 100644 --- a/app/src/main/java/com/android/model/login/longinHttp_Interface.java +++ b/app/src/main/java/com/android/model/login/longinHttp_Interface.java @@ -18,19 +18,19 @@ import retrofit2.http.Query; public interface longinHttp_Interface { //登录 @POST("tran/user/login") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable> login(@Body User user); //获取验证码 @GET("tran/user/send") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable> sendCode(@Query("phone") String phone); @POST("tran/user/register") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable> register(@Body User user); diff --git a/app/src/main/java/com/android/model/purchase/Purchase_interface.java b/app/src/main/java/com/android/model/purchase/Purchase_interface.java index 37b3132..950f85d 100644 --- a/app/src/main/java/com/android/model/purchase/Purchase_interface.java +++ b/app/src/main/java/com/android/model/purchase/Purchase_interface.java @@ -15,8 +15,8 @@ import retrofit2.http.Query; public interface Purchase_interface { @FormUrlEncoded @POST("tran/trading") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable> sendTrading(@Field("buyerId") Long buyerId, @Field("goodsId") Long goodsId, @Field("price") Integer price, diff --git a/app/src/main/java/com/android/model/upload/UpHttp_interface.java b/app/src/main/java/com/android/model/upload/UpHttp_interface.java index c14dfcf..3f48478 100644 --- a/app/src/main/java/com/android/model/upload/UpHttp_interface.java +++ b/app/src/main/java/com/android/model/upload/UpHttp_interface.java @@ -18,13 +18,13 @@ import retrofit2.http.Part; public interface UpHttp_interface { @Multipart @POST("tran/image/upload") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable> sendUpImage(@Part List fileList); @POST("tran/goods/add") - @Headers({"appId:e843562fefa144bf808a9621b107b3a4", - "appSecret:76387a99d8b52fad54b94bea1118262573381"}) + @Headers({"appId:b34ac21286ae45938add627b418a4871", + "appSecret:67526def9de11d4a64f5e80e60ed3372eea69"}) Observable> sendAddGoods(@Body Good goods); } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 049fdab..f89108c 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="8dp" + android:background="@color/tag_bg" tools:context=".activity.LoginActivity"> @@ -64,6 +65,7 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="5dp" android:hint="验证码">