1.视频发布
2.协议入口变更 3.消息时间 4.升级AndroidX
This commit is contained in:
@@ -7,18 +7,18 @@ import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.databinding.DataBindingUtil;
|
||||
import android.databinding.ViewDataBinding;
|
||||
import androidx.databinding.DataBindingUtil;
|
||||
import androidx.databinding.ViewDataBinding;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.support.annotation.LayoutRes;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.app.ActionBar;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import androidx.annotation.LayoutRes;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.ActionBar;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import android.util.Log;
|
||||
import android.view.Gravity;
|
||||
import android.view.LayoutInflater;
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
package com.sl.house_property;
|
||||
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.databinding.DataBindingUtil;
|
||||
import android.databinding.ViewDataBinding;
|
||||
|
||||
import androidx.databinding.DataBindingUtil;
|
||||
import androidx.databinding.ViewDataBinding;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.LayoutRes;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import androidx.annotation.LayoutRes;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
|
||||
/**
|
||||
* Created by ximsfei on 17-1-7.
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.sl.house_property;
|
||||
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.text.TextUtils;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.app.ProgressDialog;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import androidx.annotation.Nullable;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.sl.house_property;
|
||||
|
||||
import android.support.v4.content.FileProvider;
|
||||
import androidx.core.content.FileProvider;
|
||||
|
||||
/**
|
||||
* 自定义一个Provider,以免和引入的项目的provider冲突
|
||||
|
||||
@@ -8,7 +8,7 @@ import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
@@ -16,7 +16,6 @@ import com.dalong.refreshlayout.OnRefreshListener;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.sl.house_property.f1.AddcararageIttemActivity;
|
||||
import com.sl.house_property.user.MyMarketShopActivity;
|
||||
import com.sl.house_property.user.MyshopEditAcitivity;
|
||||
import com.sl.house_property.databinding.FragmentF1recyclerviewVorizationItemBinding;
|
||||
|
||||
@@ -4,17 +4,12 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
import com.gyf.immersionbar.ImmersionBar;
|
||||
import com.sl.house_property.f2.ElectricChargeActivity;
|
||||
import com.sl.house_property.f2.FeeActivity;
|
||||
import com.sl.house_property.databinding.FragmentMain2Binding;
|
||||
import com.sl.house_property.f2.GasFeeActivity;
|
||||
import com.sl.house_property.f2.ParkingFeeActivity;
|
||||
import com.sl.house_property.f2.PropertyFeeActivity;
|
||||
|
||||
import tools.Config;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import android.view.LayoutInflater;
|
||||
import android.widget.AbsListView;
|
||||
import android.widget.ListView;
|
||||
|
||||
@@ -8,9 +8,9 @@ import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.provider.MediaStore;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.util.DisplayMetrics;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -22,15 +22,10 @@ import android.widget.RelativeLayout;
|
||||
import com.cutil.SizeUtils;
|
||||
import com.cutil.StringUtils;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.sl.house_property.cart.AddressListActivity;
|
||||
import com.sl.house_property.databinding.FragmentMain4Binding;
|
||||
import com.sl.house_property.db.CommentBeanData;
|
||||
import com.sl.house_property.dialog.DialogHelp;
|
||||
import com.sl.house_property.discovery.LikeActivity;
|
||||
import com.sl.house_property.discovery.ShareCodeActivity;
|
||||
import com.sl.house_property.f1.UserdlistActivity;
|
||||
import com.sl.house_property.order.OrderActivity;
|
||||
import com.sl.house_property.user.MyAuthorizedFamilyHistory;
|
||||
@@ -44,18 +39,15 @@ import com.sl.house_property.user.MyUserMessage;
|
||||
import com.sl.house_property.user.MyWalletActivity;
|
||||
import com.squareup.picasso.Picasso;
|
||||
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import adapter.BaseRecycleViewAdapter;
|
||||
import entity.Advertorial_listEntity;
|
||||
import entity.MyUserFEntity;
|
||||
import entity.RegisterUser;
|
||||
import http.ApiConfig;
|
||||
@@ -120,18 +112,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
|
||||
startActivity(intent);
|
||||
}
|
||||
});
|
||||
mDataBinding.ll5.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
WebActivitytwo.runActivity(getActivity(), "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
|
||||
}
|
||||
});
|
||||
mDataBinding.ll6.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
WebActivitytwo.runActivity(getActivity(), "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
|
||||
}
|
||||
});
|
||||
|
||||
//mDataBinding.myRecyView;
|
||||
mDataBinding.userImage.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,7 @@ import android.graphics.Bitmap;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.support.v4.view.ViewPager;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
import android.util.Log;
|
||||
import android.view.GestureDetector;
|
||||
import android.view.LayoutInflater;
|
||||
|
||||
@@ -6,9 +6,9 @@ import android.content.Intent;
|
||||
import android.graphics.Rect;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.text.TextPaint;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
@@ -21,7 +21,6 @@ import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.cutil.ScreenUtils;
|
||||
@@ -34,8 +33,6 @@ import com.lzy.ninegrid.ImageInfo;
|
||||
import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
|
||||
import com.lzy.okgo.OkGo;
|
||||
import com.lzy.okgo.callback.StringCallback;
|
||||
import com.lzy.okgo.model.HttpHeaders;
|
||||
import com.lzy.okgo.model.HttpParams;
|
||||
import com.lzy.okgo.model.Response;
|
||||
import com.lzy.okgo.request.base.Request;
|
||||
import com.scwang.smartrefresh.layout.api.RefreshLayout;
|
||||
@@ -53,7 +50,6 @@ import com.sl.house_property.discovery.HistoryRecordActivity;
|
||||
import com.sl.house_property.discovery.HistoryRecordActivitytwo;
|
||||
import com.sl.house_property.discovery.SelectDialog;
|
||||
import com.sl.house_property.okgonet.HttpConstants;
|
||||
import com.sl.house_property.okgonet.Observer;
|
||||
import com.sl.house_property.order.SettleActivity;
|
||||
import com.sl.house_property.user.MyMarketShopActivity;
|
||||
import com.sl.house_property.user.MyPropertyActivity;
|
||||
@@ -91,7 +87,6 @@ import rx.Subscription;
|
||||
import rx.functions.Action1;
|
||||
import tools.Config;
|
||||
import utils.CommonUtils;
|
||||
import utils.DateUtils;
|
||||
import utils.DateUtilss;
|
||||
import utils.JsonUtils;
|
||||
import utils.KeyboardUtil;
|
||||
|
||||
@@ -4,15 +4,12 @@ import android.annotation.SuppressLint;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentTransaction;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import android.util.Log;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.widget.RadioButton;
|
||||
import android.widget.RadioGroup;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
|
||||
@@ -2,16 +2,13 @@ package com.sl.house_property;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import utils.SelectPicDanimicActivity;
|
||||
|
||||
|
||||
/**
|
||||
* Created by 蔡雅楠 on 2018/4/24.
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.app.Activity;
|
||||
import android.app.Application;
|
||||
import android.content.Context;
|
||||
import android.os.StrictMode;
|
||||
import android.support.multidex.MultiDex;
|
||||
import androidx.multidex.MultiDex;
|
||||
import android.util.Log;
|
||||
|
||||
import com.lzy.ninegrid.NineGridView;
|
||||
@@ -33,7 +33,6 @@ import javax.net.ssl.X509TrustManager;
|
||||
|
||||
import cn.jpush.android.api.JPushInterface;
|
||||
import okhttp3.OkHttpClient;
|
||||
import tools.CrashHandler;
|
||||
import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard;
|
||||
import utils.NineImageLoader;
|
||||
//import cn.jpush.im.android.api.JMessageClient;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.sl.house_property;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.design.widget.FloatingActionButton;
|
||||
import android.support.design.widget.Snackbar;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
import com.google.android.material.snackbar.Snackbar;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import android.view.View;
|
||||
|
||||
public class ScrollingActivity extends AppCompatActivity {
|
||||
|
||||
@@ -59,12 +59,25 @@ public class SettingActivity extends BaseActivity<ActivitySettingBinding> implem
|
||||
mDataBinding.id3.setOnClickListener(this);
|
||||
mDataBinding.loginout.setOnClickListener(this);
|
||||
mDataBinding.id0.setOnClickListener(this);
|
||||
|
||||
mDataBinding.myverion.setText("V" + APKVersionCodeUtils.getVerName(SettingActivity.this));
|
||||
try {
|
||||
mDataBinding.cachsiez.setText(CacheDataManager.getTotalCacheSize(SettingActivity.this));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
mDataBinding.ll5.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
|
||||
}
|
||||
});
|
||||
mDataBinding.ll6.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.sl.house_property;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import android.view.View;
|
||||
import android.webkit.WebChromeClient;
|
||||
import android.webkit.WebSettings;
|
||||
@@ -11,7 +11,6 @@ import android.webkit.WebView;
|
||||
import android.webkit.WebViewClient;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.gyf.immersionbar.ImmersionBar;
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.sl.house_property.cart;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import androidx.annotation.Nullable;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
@@ -4,9 +4,9 @@ import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ package com.sl.house_property.cart;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
@@ -6,8 +6,10 @@ import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.GridLayoutManager;
|
||||
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
@@ -16,6 +18,10 @@ import com.gyf.immersionbar.ImmersionBar;
|
||||
import com.hjq.permissions.OnPermission;
|
||||
import com.hjq.permissions.Permission;
|
||||
import com.hjq.permissions.XXPermissions;
|
||||
import com.luck.picture.lib.PictureSelector;
|
||||
import com.luck.picture.lib.config.PictureMimeType;
|
||||
import com.luck.picture.lib.entity.LocalMedia;
|
||||
import com.luck.picture.lib.listener.OnResultCallbackListener;
|
||||
import com.lxj.xpopup.XPopup;
|
||||
import com.lxj.xpopup.interfaces.OnConfirmListener;
|
||||
import com.sl.house_property.BaseActivity;
|
||||
@@ -45,6 +51,7 @@ import okhttp3.MediaType;
|
||||
import okhttp3.RequestBody;
|
||||
import retrofit2.Response;
|
||||
import tools.Config;
|
||||
import tools.GlideEngine;
|
||||
import top.zibin.luban.Luban;
|
||||
import utils.Md5;
|
||||
|
||||
@@ -199,12 +206,23 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
||||
@Override
|
||||
public void onImageItemClick(int position) {
|
||||
//普通图片被点击
|
||||
|
||||
List<File> imageList = additionImageWrapper.getImageList();
|
||||
ArrayList<String> arrayListOf = new ArrayList<>();
|
||||
for (int i = 0; i < imageList.size(); i++) {
|
||||
arrayListOf.add(imageList.get(i).getAbsolutePath());
|
||||
|
||||
}
|
||||
Intent intent = new Intent(AddDiscoveryActivity.this, ImageViewerAndDeleteActivity.class);
|
||||
|
||||
if (arrayListOf.size() > 0 & arrayListOf.get(0).endsWith("mp4")) {
|
||||
String s = arrayListOf.get(0);
|
||||
arrayListOf.clear();
|
||||
arrayListOf.add(s);
|
||||
|
||||
intent.putExtra("type", 1);
|
||||
}
|
||||
intent.putStringArrayListExtra("images", arrayListOf);
|
||||
intent.putExtra("index", position);
|
||||
intent.putStringArrayListExtra("images", arrayListOf);
|
||||
startActivityForResult(intent, 111);
|
||||
@@ -231,17 +249,6 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
||||
}
|
||||
additionImageWrapper.setData(files);
|
||||
|
||||
} else if (requestCode == REQUEST_CODE_SELECT_PICTURE && resultCode == RESULT_OK && data != null) {
|
||||
List<String> strings = Matisse.obtainPathResult(data);
|
||||
ArrayList<File> files = new ArrayList<>(additionImageWrapper.getImageList());
|
||||
try {
|
||||
List<File> list = Luban.with(AddDiscoveryActivity.this).load(strings)
|
||||
.ignoreBy(100).setTargetDir(getCacheDir().getAbsolutePath()).get();
|
||||
files.addAll(list);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
additionImageWrapper.setData(files);
|
||||
} else if (requestCode == 411 && resultCode == RESULT_OK && data != null) {
|
||||
List<String> strings = Matisse.obtainPathResult(data);
|
||||
|
||||
@@ -262,6 +269,127 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
||||
}
|
||||
}
|
||||
|
||||
private void goToSelect() {
|
||||
ArrayList<File> files = new ArrayList<>();
|
||||
int postType = PictureMimeType.ofAll();
|
||||
if (additionImageWrapper.getImageList().size() > 0) {
|
||||
postType = PictureMimeType.ofImage();
|
||||
} else {
|
||||
postType = PictureMimeType.ofAll();
|
||||
}
|
||||
PictureSelector create = PictureSelector.create(this);
|
||||
if (postType == 0) {
|
||||
create.openGallery(postType)
|
||||
.isCamera(true)
|
||||
.isWeChatStyle(true)
|
||||
.maxSelectNum(additionImageWrapper.getRemainCount())
|
||||
.isPreviewImage(true)
|
||||
.isPreviewVideo(true)
|
||||
.isCompress(true)
|
||||
.videoMaxSecond(20)
|
||||
.videoMinSecond(2)
|
||||
.recordVideoSecond(15)
|
||||
.imageEngine(GlideEngine.createGlideEngine())
|
||||
.isWithVideoImage(false)
|
||||
.forResult(new OnResultCallbackListener<LocalMedia>() {
|
||||
@Override
|
||||
public void onResult(List<LocalMedia> result) {
|
||||
if (result != null && result.size() > 0) {
|
||||
for (int i = 0; i < result.size(); i++) {
|
||||
LocalMedia item = result.get(i);
|
||||
if (item.getMimeType().startsWith("image")) {
|
||||
files.add(new File(item.getCompressPath()));
|
||||
} else if (item.getMimeType().startsWith("video")) {
|
||||
additionImageWrapper.setLimit(1);
|
||||
files.add(new File(item.getRealPath()));
|
||||
}
|
||||
}
|
||||
additionImageWrapper.setData(files);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCancel() {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
// private var postType: Int = 0
|
||||
// fun goToSelect() {
|
||||
// if (additionImageWrapper.imageList.size > 0) {
|
||||
// if (postType == 0) {
|
||||
// postType = 1
|
||||
// }
|
||||
// }
|
||||
// val create = PictureSelector.create(this)
|
||||
// if (postType == 0) {
|
||||
// create.openGallery(PictureMimeType.ofAll())
|
||||
|
||||
//
|
||||
// .forResult(object : OnResultCallbackListener<LocalMedia> {
|
||||
// override fun onResult(result: MutableList<LocalMedia>?) {
|
||||
// if (!result.isNullOrEmpty()) {
|
||||
// val mutableListOf = mutableListOf<VideoImagePathEntity>()
|
||||
// mutableListOf.addAll(additionImageWrapper.imageList)
|
||||
// for (item in result) {
|
||||
// if (item.mimeType.startsWith("image")) {
|
||||
// postType = 1
|
||||
// mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
|
||||
//
|
||||
// } else if (item.mimeType.startsWith("video")) {
|
||||
// postType = 2
|
||||
// WKLog.e(item.realPath)
|
||||
// mutableListOf.add(VideoImagePathEntity(2, item.realPath))
|
||||
// additionImageWrapper.setLimit(1)
|
||||
// WKLog.e(item.path)
|
||||
// WKLog.e(item.realPath)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
// additionImageWrapper.setData(mutableListOf)
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// override fun onCancel() {
|
||||
// }
|
||||
//
|
||||
// })
|
||||
// } else if (postType == 1) {
|
||||
// create.openGallery(PictureMimeType.ofImage())
|
||||
// .isCamera(true)
|
||||
// .isWeChatStyle(true)
|
||||
// .maxSelectNum(additionImageWrapper.remainCount)
|
||||
//
|
||||
// .isPreviewImage(true)
|
||||
// .isPreviewVideo(true)
|
||||
// .isCompress(true)
|
||||
// .imageEngine(GlideEngine.createGlideEngine())
|
||||
// .isWithVideoImage(false)
|
||||
// .forResult(object : OnResultCallbackListener<LocalMedia> {
|
||||
// override fun onResult(result: MutableList<LocalMedia>?) {
|
||||
// val mutableListOf = mutableListOf<VideoImagePathEntity>()
|
||||
// mutableListOf.addAll(additionImageWrapper.imageList)
|
||||
// if (!result.isNullOrEmpty()) {
|
||||
// for (item in result) {
|
||||
// mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
|
||||
// }
|
||||
// }
|
||||
// additionImageWrapper.setData(mutableListOf)
|
||||
// }
|
||||
//
|
||||
// override fun onCancel() {
|
||||
// }
|
||||
//
|
||||
// })
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }
|
||||
private void selectImage(int requestCode, int max) {
|
||||
Matisse
|
||||
.from(this)
|
||||
@@ -296,7 +424,8 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
||||
@Override
|
||||
public void hasPermission(List<String> granted, boolean isAll) {
|
||||
if (isAll) {
|
||||
selectImage(requestCode, max);
|
||||
goToSelect();
|
||||
// selectImage(requestCode, max);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -383,15 +512,15 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
|
||||
|
||||
|
||||
for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
|
||||
map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data;charset=UTF-8"), additionImageWrapper.getImageList().get(i)));
|
||||
Log.e("xxxx", additionImageWrapper.getImageList().get(i).getName());
|
||||
map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
|
||||
Log.e("xxxx", additionImageWrapper.getImageList().get(i).getAbsolutePath());
|
||||
}
|
||||
if (file!=null){
|
||||
map.put("pic"+ additionImageWrapper.getImageList().size()+ "\"; filename=\"" + file.getName() + "", RequestBody.create(MediaType.get("multipart/form-data;charset=UTF-8"), file));
|
||||
if (file != null) {
|
||||
map.put("pic" + additionImageWrapper.getImageList().size() + "\"; filename=\"" + file.getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), file));
|
||||
|
||||
map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size()+1 + ""));
|
||||
map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + 1 + ""));
|
||||
|
||||
}else {
|
||||
} else {
|
||||
map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + ""));
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
@@ -7,9 +7,9 @@ import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.support.v4.app.ActivityCompat;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import android.text.TextPaint;
|
||||
import android.widget.TextView;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.view.View;
|
||||
|
||||
import com.lxj.xpopup.core.BottomPopupView;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
|
||||
@@ -4,13 +4,12 @@ import android.app.ProgressDialog;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -75,8 +74,6 @@ import tools.Config;
|
||||
import tools.PicassoRoundTransform;
|
||||
import top.zibin.luban.Luban;
|
||||
import utils.CommonUtils;
|
||||
import utils.DateUtils;
|
||||
import utils.GetJsonDataUtil;
|
||||
import utils.KeyboardUtil;
|
||||
import utils.Md5;
|
||||
import utils.TimeUtils;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.support.v4.app.FragmentPagerAdapter;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentPagerAdapter;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
@@ -24,7 +22,6 @@ import com.gyf.immersionbar.ImmersionBar;
|
||||
import com.lzy.ninegrid.ImageInfo;
|
||||
import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
|
||||
import com.sl.house_property.BaseActivity;
|
||||
import com.sl.house_property.MainFragment;
|
||||
import com.sl.house_property.MainTabActivity;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.databinding.ItemCommentBinding;
|
||||
|
||||
@@ -6,11 +6,11 @@ import android.graphics.Bitmap;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.support.v4.app.FragmentPagerAdapter;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentPagerAdapter;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
@@ -27,10 +27,8 @@ import com.sl.house_property.MainTabActivity;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.databinding.ItemCommentBinding;
|
||||
import com.sl.house_property.databinding.ItemDiscoveryBinding;
|
||||
import com.sl.house_property.databinding.LayoutHistoryRecordBinding;
|
||||
import com.sl.house_property.databinding.LayoutHistoryRecordtwoBinding;
|
||||
import com.sl.house_property.user.AddAnewGranteeActivity;
|
||||
import com.sl.house_property.user.MyGuaranteeHistory;
|
||||
import com.squareup.picasso.Picasso;
|
||||
import com.squareup.picasso.Target;
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@ import android.graphics.Rect;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -30,7 +30,6 @@ import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
|
||||
import com.scwang.smartrefresh.layout.api.RefreshLayout;
|
||||
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
|
||||
import com.sl.house_property.BaseFragment;
|
||||
import com.sl.house_property.DoConfig;
|
||||
import com.sl.house_property.MainTabActivity;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.databinding.FragmentHistoryRecordBinding;
|
||||
@@ -65,7 +64,6 @@ import utils.CommonUtils;
|
||||
import utils.DateUtils;
|
||||
import utils.KeyboardUtil;
|
||||
import utils.Md5;
|
||||
import utils.SPUtils;
|
||||
import utils.UtilHelpers;
|
||||
|
||||
public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBinding> implements MainTabActivity.MyOnTouchListener {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v4.view.PagerAdapter;
|
||||
import androidx.viewpager.widget.PagerAdapter;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
@@ -2,10 +2,14 @@ package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.view.ViewPager;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
import com.lzy.ninegrid.preview.MediaController;
|
||||
import com.sl.house_property.BaseActivity;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.databinding.ActivityImagePreviewAndDeleteBinding;
|
||||
@@ -16,7 +20,7 @@ public class ImageViewerAndDeleteActivity extends BaseActivity<ActivityImagePrev
|
||||
|
||||
private ArrayList<String> mList;
|
||||
private ImageViewerAdapter adapter;
|
||||
private int index;
|
||||
private int index=0;
|
||||
|
||||
@Override
|
||||
protected int getLayoutResId() {
|
||||
@@ -27,49 +31,92 @@ public class ImageViewerAndDeleteActivity extends BaseActivity<ActivityImagePrev
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
mList = getIntent().getStringArrayListExtra("images");
|
||||
index = getIntent().getIntExtra("index", 0);
|
||||
adapter = new ImageViewerAdapter(this, mList);
|
||||
mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
|
||||
int type = getIntent().getIntExtra("type", 0);
|
||||
if (type == 0) {
|
||||
mList = getIntent().getStringArrayListExtra("images");
|
||||
index = getIntent().getIntExtra("index", 0);
|
||||
adapter = new ImageViewerAdapter(this, mList);
|
||||
mDataBinding.vpPreview.setAdapter(adapter);
|
||||
mDataBinding.vpPreview.setCurrentItem(index);
|
||||
mDataBinding.vpPreview.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
|
||||
@Override
|
||||
public void onPageScrolled(int i, float v, int i1) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageSelected(int i) {
|
||||
mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, i + 1, mList.size()));
|
||||
index = i;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageScrollStateChanged(int i) {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
mDataBinding.tvDelete.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (mList.size() == 1) {
|
||||
mList.remove(index);
|
||||
Intent intent = new Intent();
|
||||
intent.putStringArrayListExtra("images", mList);
|
||||
setResult(111, intent);
|
||||
finish();
|
||||
} else {
|
||||
mList.remove(index);
|
||||
adapter.notifyDataSetChanged();
|
||||
mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
} else {
|
||||
mList = getIntent().getStringArrayListExtra("images");
|
||||
mDataBinding.flVideo.setVisibility(View.VISIBLE);
|
||||
mDataBinding.flParent.setVisibility(View.GONE);
|
||||
Log.e("xxxx",mList.get(0));
|
||||
mDataBinding. pLVideoView.setVideoPath(mList.get(0));
|
||||
MediaController mMediaController = new MediaController(this);
|
||||
mDataBinding. pLVideoView.setMediaController(mMediaController);
|
||||
mDataBinding. pLVideoView.start();
|
||||
mDataBinding.tvDelete.setOnClickListener(v -> {
|
||||
|
||||
mDataBinding.tvDelete.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (mList.size() == 1) {
|
||||
mList.remove(index);
|
||||
Intent intent = new Intent();
|
||||
intent.putStringArrayListExtra("images", mList);
|
||||
setResult(111, intent);
|
||||
finish();
|
||||
} else {
|
||||
mList.remove(index);
|
||||
adapter.notifyDataSetChanged();
|
||||
mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
mDataBinding.vpPreview.setAdapter(adapter);
|
||||
mDataBinding.vpPreview.setCurrentItem(index);
|
||||
mDataBinding.vpPreview.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
|
||||
@Override
|
||||
public void onPageScrolled(int i, float v, int i1) {
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageSelected(int i) {
|
||||
mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, i + 1, mList.size()));
|
||||
index = i;
|
||||
}
|
||||
mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
|
||||
|
||||
@Override
|
||||
public void onPageScrollStateChanged(int i) {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
mDataBinding.pLVideoView.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPause() {
|
||||
super.onPause();
|
||||
mDataBinding. pLVideoView.pause();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
mDataBinding. pLVideoView.stopPlayback();
|
||||
}
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
//返回操作后的数据
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.sl.house_property.BaseActivity;
|
||||
import com.sl.house_property.MainTabActivity;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.support.v4.app.FragmentPagerAdapter;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentPagerAdapter;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v4.view.ViewPager;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.MotionEvent;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.FragmentActivity;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import android.view.View;
|
||||
|
||||
import com.gyf.immersionbar.ImmersionBar;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.view.View;
|
||||
|
||||
import com.lxj.xpopup.core.BottomPopupView;
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
package com.sl.house_property.discovery;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.text.TextUtils;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.util.Log;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.widget.RadioGroup;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.chad.library.adapter.base.BaseQuickAdapter;
|
||||
import com.google.gson.Gson;
|
||||
@@ -18,7 +17,6 @@ import com.google.gson.reflect.TypeToken;
|
||||
import com.lxj.xpopup.XPopup;
|
||||
import com.selectpicker.OptionsPopupWindow;
|
||||
import com.sl.house_property.BaseActivity;
|
||||
import com.sl.house_property.DoConfig;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.db.CommentBeanData;
|
||||
import com.sl.house_property.db.dao.CommentDao;
|
||||
@@ -44,10 +42,8 @@ import my_loader.Resultcode;
|
||||
import rx.Subscription;
|
||||
import rx.functions.Action1;
|
||||
import tools.Config;
|
||||
import utils.DateUtils;
|
||||
import utils.DateUtilss;
|
||||
import utils.Md5;
|
||||
import utils.SPUtils;
|
||||
|
||||
public class ShareCodeActivity extends BaseActivity<com.sl.house_property.databinding.ActivityEntranceguardControl2Binding> {
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.sl.house_property.discovery;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Bitmap;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.text.Html;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
|
||||
@@ -6,7 +6,7 @@ import android.graphics.Canvas;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.RectF;
|
||||
import android.graphics.Shader;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
|
||||
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
|
||||
|
||||
@@ -22,7 +22,7 @@ public class MessageAdapter extends BaseQuickAdapter<MessageEntity.StoreInfo, Ba
|
||||
.into(baseViewHolder.itemView.<ImageView>findViewById(R.id.iv));
|
||||
baseViewHolder.setText(R.id.tv_name, messageEntity.getStore_name());
|
||||
baseViewHolder.setText(R.id.tv_title, messageEntity.getTitle());
|
||||
baseViewHolder.setText(R.id.tv_time, TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(messageEntity.getCtime())));
|
||||
baseViewHolder.setText(R.id.tv_time, messageEntity.getCtime());
|
||||
if (messageEntity.getIs_dot().equals("1")) {
|
||||
baseViewHolder.getView(R.id.view).setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.sl.house_property.message;
|
||||
|
||||
import android.support.annotation.Keep;
|
||||
import androidx.annotation.Keep;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package com.sl.house_property.message;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.util.Log;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@@ -18,8 +16,6 @@ import android.widget.Toast;
|
||||
import com.chad.library.adapter.base.BaseQuickAdapter;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.gyf.immersionbar.ImmersionBar;
|
||||
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
|
||||
import com.scwang.smartrefresh.layout.api.RefreshLayout;
|
||||
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
|
||||
@@ -29,8 +25,6 @@ import com.sl.house_property.WebActivitytwo;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@ import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.view.View;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
|
||||
@@ -4,8 +4,8 @@ import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.view.View;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
|
||||
@@ -6,7 +6,7 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import androidx.annotation.Nullable;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import android.view.View;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.sl.house_property.order;
|
||||
|
||||
import android.support.annotation.Keep;
|
||||
import androidx.annotation.Keep;
|
||||
|
||||
@Keep
|
||||
public class WxPayEntity {
|
||||
|
||||
@@ -5,7 +5,7 @@ import android.app.DatePickerDialog;
|
||||
import android.app.TimePickerDialog;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.databinding.DataBindingUtil;
|
||||
import androidx.databinding.DataBindingUtil;
|
||||
import android.graphics.Bitmap;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
@@ -14,19 +14,15 @@ import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.provider.MediaStore;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.helper.ItemTouchHelper;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
import android.view.Gravity;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.DatePicker;
|
||||
import android.widget.RadioGroup;
|
||||
import android.widget.TimePicker;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.selectpicker.OptionsPopupWindow;
|
||||
import com.cutil.FileUtils;
|
||||
@@ -39,7 +35,6 @@ import com.google.gson.reflect.TypeToken;
|
||||
import com.sl.house_property.BaseActivity;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.databinding.ActivityAddAnewGranteeBinding;
|
||||
import com.sl.house_property.databinding.PopwindowLayoutBinding;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
@@ -64,15 +59,12 @@ import my_view.SelectPictureWayDialog;
|
||||
import my_view.SelectRepairWayDialog;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewDivider;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
|
||||
import rx.Subscription;
|
||||
import rx.functions.Action1;
|
||||
import tools.Config;
|
||||
import tools.DateTimeUtils;
|
||||
import tools.ImageCompress;
|
||||
import tools.PopupWindowHelper;
|
||||
import tools.time.CustomTimePicker;
|
||||
import http.ApiConfig;
|
||||
import http.FileUpLoad.retrofit.HttpStaticApi;
|
||||
@@ -82,7 +74,6 @@ import okhttp3.RequestBody;
|
||||
import retrofit2.Response;
|
||||
import utils.BitmapTools;
|
||||
import utils.Md5;
|
||||
import utils.MyPhoneValue;
|
||||
import utils.SelectPicDanimicActivity;
|
||||
|
||||
public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeBinding> implements View.OnClickListener, RetrofitCallBack {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.sl.house_property.user;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
package com.sl.house_property.user;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import androidx.annotation.NonNull;
|
||||
import android.text.TextUtils;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.dalong.refreshlayout.OnRefreshListener;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
|
||||
@@ -2,42 +2,34 @@ package com.sl.house_property.user;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.helper.ItemTouchHelper;
|
||||
import android.view.Gravity;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.cutil.SizeUtils;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.sl.house_property.BR;
|
||||
import com.sl.house_property.BaseActivity;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.databinding.ActivityMyGranteeDetailBinding;
|
||||
import com.sl.house_property.databinding.ItemRecycler1Binding;
|
||||
import com.squareup.picasso.Picasso;
|
||||
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import adapter.BaseRecycleViewAdapter;
|
||||
import entity.RegisterUser;
|
||||
import entity.RepairDetailEntity;
|
||||
import entity.Repair_listEntity;
|
||||
import imageselector.FullScreenOnlinePreviewActivity;
|
||||
import my_loader.Loader;
|
||||
import my_loader.Resultcode;
|
||||
import my_view.ConfirmForGaranteeDetailDialog;
|
||||
import my_view.RecyclerViewSpacesItemDecoration;
|
||||
import my_view.tao_bao_refresh.FullyGridLayoutManager;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
|
||||
|
||||
@@ -12,26 +12,20 @@ import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.provider.MediaStore;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.helper.ItemTouchHelper;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
import android.text.Editable;
|
||||
import android.view.Gravity;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.cutil.FileUtils;
|
||||
import com.cutil.ImageUtils;
|
||||
import com.cutil.RegexUtils;
|
||||
import com.cutil.SizeUtils;
|
||||
import com.cutil.Utils;
|
||||
import com.sl.house_property.BaseActivity;
|
||||
import com.sl.house_property.Main1Fragment;
|
||||
import com.sl.house_property.MainTabActivity;
|
||||
import com.sl.house_property.R;
|
||||
import com.sl.house_property.databinding.ActivityMyshopEditAcitivityBinding;
|
||||
|
||||
@@ -39,7 +33,6 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import entity.RegisterUser;
|
||||
@@ -55,7 +48,6 @@ import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewD
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
|
||||
import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
|
||||
import tools.Config;
|
||||
import tools.ImageCompress;
|
||||
import http.ApiConfig;
|
||||
import http.FileUpLoad.retrofit.HttpStaticApi;
|
||||
import http.FileUpLoad.retrofit.RetrofitCallBack;
|
||||
@@ -65,8 +57,6 @@ import retrofit2.Response;
|
||||
import utils.BitmapTools;
|
||||
import utils.IndentTextWatcher;
|
||||
import utils.Md5;
|
||||
import utils.MyPhoneValue;
|
||||
import utils.SelectPicDanimicActivity;
|
||||
|
||||
public class MyshopEditAcitivity extends BaseActivity<ActivityMyshopEditAcitivityBinding> implements View.OnClickListener, RetrofitCallBack {
|
||||
private static final int REQUEST_CODE = 0x00000011;
|
||||
|
||||
@@ -12,14 +12,13 @@ import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.provider.MediaStore;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.helper.ItemTouchHelper;
|
||||
import android.view.Gravity;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.cutil.FileUtils;
|
||||
import com.cutil.ImageUtils;
|
||||
|
||||
Reference in New Issue
Block a user