diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f43a7f0..ee4480e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -64,10 +64,6 @@ - @@ -83,7 +79,6 @@ > - diff --git a/app/src/main/java/com/fenghoo/seven/FHConfig.java b/app/src/main/java/com/fenghoo/seven/FHConfig.java deleted file mode 100644 index 91fbc10..0000000 --- a/app/src/main/java/com/fenghoo/seven/FHConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.fenghoo.seven; - -/** - * 蜂狐配置参数 - * Created by XiaoQiang on 2017/6/24. - */ -public class FHConfig { - - - /** - * 地区选择SHNG - */ - public static String KEY_OPTIONS1= "options1"; - /** - * 地区选择 - */ - public static String KEY_OPTIONS2= "options2"; - /** - * 地区选择 - */ - public static String KEY_OPTIONS3= "options3"; - -} diff --git a/app/src/main/java/com/fenghoo/seven/base/BaseFragment.java b/app/src/main/java/com/fenghoo/seven/base/BaseFragment.java index 013bb3e..b5596e7 100644 --- a/app/src/main/java/com/fenghoo/seven/base/BaseFragment.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseFragment.java @@ -2,17 +2,27 @@ package com.fenghoo.seven.base; import android.Manifest; import android.app.Activity; +import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.net.Uri; import android.os.Build; import android.text.TextPaint; +import android.util.Log; +import android.util.TypedValue; import android.widget.TextView; +import android.widget.Toast; +import com.fenghoo.seven.R; + +import androidx.annotation.IdRes; +import androidx.annotation.StringRes; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; /** * 项目名:erp @@ -28,7 +38,10 @@ public class BaseFragment extends Fragment { public static final int REQUEST_CALL_PERMISSION = 10111; //拨号请求码 - + private static final String TAG = "BaseFragment"; + protected Activity mActivity; + private ProgressDialog mProgressDialog; + private boolean isVisible; /** * 申请指定的权限. @@ -111,4 +124,188 @@ public class BaseFragment extends Fragment { } return flag; } + + @Override + public void setUserVisibleHint(boolean isVisibleToUser) { + super.setUserVisibleHint(isVisibleToUser); + if (isVisibleToUser && !isVisible) { + isVisible = true; + onVisible(); + } else { + if (isVisible) { + isVisible = false; + onInvisible(); + } + } + Log.d(TAG, "setUserVisibleHint: " + isVisibleToUser); + } + + @Override + public void onResume() { + super.onResume(); + if (!isVisible) { + isVisible = true; + onVisible(); + } + } + + @Override + public void onPause() { + super.onPause(); + if (isVisible) { + isVisible = false; + onInvisible(); + } + } + + + /** + * Fragment可见时 + */ + protected void onVisible() { + Log.d(TAG, "onVisible"); + } + + /** + * Fragment不可见时 + */ + protected void onInvisible() { + Log.d(TAG, "onInvisible"); + } + + /** + * toast + * + * @param msg 吐丝的内容 + */ + public void toast(String msg) { + Toast.makeText(mContext, msg, Toast.LENGTH_SHORT).show(); + } + + /** + * toast + * + * @param ids 吐丝的内容的字符串ids + */ + public void toast(@StringRes int ids) { + toast(getString(ids)); + } + + + /** + * 线程安全的toast + * + * @param msg + */ + public void toastThreadSafe(final String msg) { + if (null != mActivity) { + mActivity.runOnUiThread(new Runnable() { + @Override + public void run() { + toast(msg); + } + }); + } + } + + /** + * 线程安全的toast + * + * @param ids + */ + public void toastThreadSafe(@StringRes final int ids) { + if (null != mActivity) { + mActivity.runOnUiThread(new Runnable() { + @Override + public void run() { + toast(ids); + } + }); + } + } + + /** + * 开启一个Activity + * + * @param clz 需要开启的Activity + */ + public void startActivity(Class clz) { + if (null != mContext) { + startActivity(new Intent(mContext, clz)); +// getActivity().overridePendingTransition(R.anim.trans_next_in,R.anim.trans_next_out); + } + } + + /** + * 开启一个Activity,并finish掉当前的Activity + * + * @param clz + */ + public void startActivityAndFinishSelf(Class clz) { + if (null != mActivity) { + startActivity(clz); + mActivity.finish(); + } + + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + } + + /** + * 初始化进度对话框 + */ + protected void showProgressDialog(String dialogMessage) { + mProgressDialog = new ProgressDialog(mContext); + mProgressDialog.setCanceledOnTouchOutside(false); + mProgressDialog.setMessage(dialogMessage); + mProgressDialog.show(); + } +// +// @Override +// public void onHiddenChanged(boolean hidden) { +// super.onHiddenChanged(hidden); +// Log.d(TAG, "onHiddenChanged: "+hidden); +// isVisible = !hidden; +// if(isVisible){ +// onVisible(); +// }else { +// onInvisible(); +// } +// } + + /** + * 关闭进度对话框 + */ + protected void dismissProgressDialog() { + if (null != mProgressDialog && mProgressDialog.isShowing()) { + mProgressDialog.dismiss(); + } + } + + /** + * 初始化刷新控件的参数 + * + * @param ids 刷新控件的id + */ + protected SwipeRefreshLayout setSwipeRefreshLayout(@IdRes int ids) { + SwipeRefreshLayout mRefreshLayout = (SwipeRefreshLayout) getView().findViewById(ids); + mRefreshLayout.setProgressViewOffset(false, 0, + (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24, getResources().getDisplayMetrics())); + mRefreshLayout.setColorSchemeResources(R.color.colorGreen); + return mRefreshLayout; + } + + + /** + * 隐藏键盘 + */ + public void hideKB() { +// if (null != mContext && mContext instanceof BaseActivity) { +// ((BaseActivity) mContext).hintKb(); +// } + } + } diff --git a/app/src/main/java/com/fenghoo/seven/test/BaseModel.java b/app/src/main/java/com/fenghoo/seven/base/BaseModel.java similarity index 86% rename from app/src/main/java/com/fenghoo/seven/test/BaseModel.java rename to app/src/main/java/com/fenghoo/seven/base/BaseModel.java index 921f02c..50d8aaa 100644 --- a/app/src/main/java/com/fenghoo/seven/test/BaseModel.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseModel.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.test; +package com.fenghoo.seven.base; import java.io.Serializable; diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/LoginActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/LoginActivity.java deleted file mode 100644 index b576257..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/activity/LoginActivity.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.fenghoo.seven.main.activity; - -import android.os.Bundle; -import android.os.CountDownTimer; -import android.text.Html; -import android.view.View; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.TextView; - -import com.fenghoo.seven.R; -import com.fenghoo.seven.base.BaseTreeActivity; -import com.fenghoo.seven.main.activity.mvp.contract.LoginContract; -import com.fenghoo.seven.main.activity.mvp.presenterImpl.LoginPresenterImpl; - -import androidx.annotation.NonNull; - -/** - * LoginActivity - * 类描述:登录页面 - * 2018/10/30 5:06 - * mengjuan - */ - -public class LoginActivity extends BaseTreeActivity implements LoginContract.View,View.OnClickListener { - - private EditText mEtcode; - private Button mBtnsendcode; - private CheckBox mCheckBox; - private TextView loginTv;//登录 - /** - * 请输入手机号 - */ - private EditText mEtPhone; - /** - * 请输入验证码 - */ - private EditText mEtCode; - /** - * 获取验证码 - */ - private TextView mTvGetCode; - /** - * 验证码错误请重新输入! - */ - private TextView mTvCodeError; - /** - * 登录 - */ - private Button mBtnLogin; - - private CountDownTimer timer = new CountDownTimer(60000, 1000) { - @Override - public void onTick(long millisUntilFinished) { - mTvGetCode.setText(Html.fromHtml("" + (millisUntilFinished / 1000) + "秒后可重发")); - } - - @Override - public void onFinish() { - mTvGetCode.setClickable(true); - mTvGetCode.setText("发送验证码"); - } - }; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - // TODO:OnCreate Method has been created, run FindViewById again to generate code - setContentView(R.layout.activity_login); - initView(); - } - - @Override - public int getLayoutId() { - return R.layout.activity_login; - } - - @Override - protected void initView() { - mEtPhone = (EditText) findViewById(R.id.et_phone); - mEtCode = (EditText) findViewById(R.id.et_code); - mTvGetCode = (TextView) findViewById(R.id.tv_get_code); - mTvGetCode.setOnClickListener(this); - mTvCodeError = (TextView) findViewById(R.id.tv_code_error); - mBtnLogin = (Button) findViewById(R.id.btn_login); - mBtnLogin.setOnClickListener(this); - } - - @Override - protected void initData() { - getPresenter().initData(); - } - - @Override - protected void initEvent() { - - } - - - @Override - public void onClick(View view) { - switch (view.getId()) { - case R.id.btn_login://登录 - getPresenter().login(); - break; - case R.id.tv_get_code://获取验证码 - //发送验证码 - getPresenter().sendCode(); - break; - } - } - - - @NonNull - @Override - public LoginPresenterImpl createPresenter() { - return new LoginPresenterImpl(); - } - - @Override - public String getMobile() { - return mEtPhone.getText().toString(); - } - - @Override - public void setMobile(String mobile) { - - } - - @Override - public String getPassWord() { - return null; - } - - @Override - public void setPassWord(String passWord) { - - } - - @Override - public String getCode() { - return mEtCode.getText().toString(); - } - - @Override - public boolean isSavePassword() { - return false; - } - - @Override - public void setCodeBtnEnable(boolean enable) { - - } - - @Override - public void setCodeBtnText(String msg) { - - } - -} diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginContract.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginContract.java deleted file mode 100644 index 9e76ccf..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginContract.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.fenghoo.seven.main.activity.mvp.contract; - - -import com.fenghoo.seven.base.BaseTreeView; -import com.fenghoo.seven.main.my.entity.loginInfoBean; -import com.fenghoo.seven.network.ApiCallBack; - -/** - * LoginContract - * (๑• . •๑) - * 类描述: - * Created by LeiXiaoXing on 2017/4/19 15:53 - */ - -public class LoginContract { - public interface View extends BaseTreeView { - - /** - * 获取手机号 - * - * @return 手机号 - */ - String getMobile(); - - /** - * 设置手机号码 - * - * @param mobile 手机号 - */ - void setMobile(String mobile); - - /** - * 获取密码 - * - * @return 密码 - */ - String getPassWord(); - - /** - * 设置密码 - * - * @param passWord 登陆密码 - */ - void setPassWord(String passWord); - - /** - * 获取验证码 - * - * @return 验证码 - */ - String getCode(); - - /** - * 是否记住密码 - * - * @return - */ - boolean isSavePassword(); - - - - - /** - * 设置发送验证码按钮是否可用 - * - * @param enable 是否可用 - */ - void setCodeBtnEnable(boolean enable); - - /** - * 设置发送验证码按钮文本内容 - * - * @param msg - */ - void setCodeBtnText(String msg); - - - - - } - - public interface Presenter { - - /** - * 初始化数据 - */ - void initData(); - - /** - * 登录 - */ - void login(); - - /** - * 发送验证码 - */ - void sendCode(); - - - } - - public interface Model { - - /** - * 获取保存的手机号码 - * - * @return 手机号码 - */ - String getSaveMobli(); - - /** - * 获取保存的密码 - * - * @return 密码 - */ - String getSavePassword(); - - /** - * 登录 - * - * @param mobile 手机号 - * @param code 验证码 - * @param callBack 回调函数 - */ - void login(String mobile, String code, ApiCallBack callBack); - - - void sendCode(String mobile, ApiCallBack callBack); - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginModelImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginModelImpl.java deleted file mode 100644 index 61c5004..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginModelImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.fenghoo.seven.main.activity.mvp.model; - - -import com.fenghoo.seven.main.activity.mvp.contract.LoginContract; -import com.fenghoo.seven.main.my.entity.loginInfoBean; -import com.fenghoo.seven.network.ApiCallBack; -import com.fenghoo.seven.network.http.ApiUtils; -import com.fenghoo.seven.network.http.ResponseBean; -import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; - -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.annotations.NonNull; -import io.reactivex.functions.Consumer; -import io.reactivex.schedulers.Schedulers; - -/** - * Created by Administrator on 2017/04/19 - */ - -public class LoginModelImpl implements LoginContract.Model { - - - - @Override - public String getSaveMobli() { - return ProfileSpUtils.getInstance().getKeyMobile(); - } - - @Override - public String getSavePassword() { - return ProfileSpUtils.getInstance().getKeyPassword(); - } - - @Override - public void login(String mobile, String code, final ApiCallBack callBack) { - - ApiUtils.getApi() - .login(mobile, code) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Consumer() { - @Override - public void accept(@NonNull ResponseBean responseBean) throws Exception { - callBack.onResponse(responseBean); - } - }, new Consumer() { - @Override - public void accept(@NonNull Throwable throwable) throws Exception { - callBack.onFailure(throwable); - } - }); - } - - - @Override - public void sendCode( String mobile, final ApiCallBack callBack) { - ApiUtils.getApi() - .pin(mobile) - .observeOn(AndroidSchedulers.mainThread()) - .subscribeOn(Schedulers.io()) - .subscribe(new Consumer() { - @Override - public void accept(@NonNull ResponseBean responseBean) throws Exception { - callBack.onResponse(responseBean); - } - }, new Consumer() { - @Override - public void accept(@NonNull Throwable throwable) throws Exception { - callBack.onFailure(throwable); - } - }); - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java deleted file mode 100644 index efdccb8..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.fenghoo.seven.main.activity.mvp.presenterImpl; - -import android.text.TextUtils; -import android.util.Log; - -import com.fenghoo.seven.main.activity.MainActivity; -import com.fenghoo.seven.main.activity.mvp.contract.LoginContract; -import com.fenghoo.seven.main.activity.mvp.model.LoginModelImpl; -import com.fenghoo.seven.main.my.entity.loginInfoBean; -import com.fenghoo.seven.network.ApiCallBack; -import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; - -import java.util.concurrent.TimeUnit; - -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import io.reactivex.observers.DefaultObserver; - -/** - * Created by Administrator on 2017/04/19 - */ - -public class LoginPresenterImpl extends MvpBasePresenter implements LoginContract.Presenter{ - - private LoginModelImpl mModel; - - public LoginPresenterImpl() { - mModel = new LoginModelImpl(); - } - - @Override - public void initData() { - if (getView() == null) { - return; - } - String saveMobli = mModel.getSaveMobli(); - if (!TextUtils.isEmpty(saveMobli)) { - getView().setMobile(saveMobli); - } - String savePassword = mModel.getSavePassword(); - if (!TextUtils.isEmpty(savePassword)) { - getView().setPassWord(savePassword); - } - } - - @Override - public void login() { - getView().startActivity(MainActivity.class); - if (getView() == null) { - return; - } - //验证手机号码规范 - final String mobile = getView().getMobile(); - if (TextUtils.isEmpty(mobile) || mobile.length() != 11) { - getView().toast("请输入正确的手机号码"); - return; - } - //验证密码规范 - final String passWord = getView().getPassWord(); - - //验证验证规范 - String code = getView().getCode(); - if (TextUtils.isEmpty(code) || code.length() != 6) { - getView().toast("请输入正确的验证码"); - return; - } - getView().showProgressDialog("登录中..."); - mModel.login(mobile, code, new ApiCallBack() { - @Override - protected void onSuccess(loginInfoBean data, String message) { - if (getView() == null) { - return; - } - //getView().dismissProgressDialog(); -// mModel.setLogin(true); -// mModel.saveUserInfo(data); - Log.d("LoginPresenterImpl: ", data.toString()); - - //记住密码 -// boolean savePassword = getView().isSavePassword(); -// mModel.savePassword(savePassword ? mobile : null, savePassword ? passWord : null); - - //toLive(ProfileSpUtils.getInstance().getUserProfie().getDefault_live_id()); - getView().startActivity(MainActivity.class); - } - - @Override - protected void onFailure(String error) { - if (getView() == null) { - return; - } - getView().dismissProgressDialog(); - getView().toast(error); - } - }); - } - - - @Override - public void sendCode() { - //验证手机号码规范 - if (getView() == null) { - return; - } - String mobile = getView().getMobile(); - if (TextUtils.isEmpty(mobile) || mobile.length() != 11) { - getView().toast("请输入正确的手机号码"); - return; - } - getView().showProgressDialog("验证码发送中"); - mModel.sendCode(mobile, new ApiCallBack() { - @Override - protected void onSuccess(Object responseData, String message) { - if (getView() == null) { - return; - } - getView().dismissProgressDialog(); - getView().toast("发送成功,请注意查收"); - //发送成功开始倒计时 - final int count = 60; - Observable.interval(0, 1, TimeUnit.SECONDS)//设置0秒延迟,每隔1秒发送一次数据 - .take(count + 1)//循环61次 - .map(new Function() { - @Override - public Long apply(@NonNull Long aLong) throws Exception { - return count - aLong; - } - }) - .observeOn(AndroidSchedulers.mainThread()) - .doOnSubscribe(new Consumer() { - @Override - public void accept(@NonNull Disposable disposable) throws Exception { - if (getView() == null) { - return; - } - //在发送数据时按钮不可点击 - getView().setCodeBtnEnable(false); - } - }) - .subscribe(new DefaultObserver() { - @Override - public void onNext(Long aLong) { - if (getView() == null) { - return; - } - getView().setCodeBtnText("(" + aLong + "s)获取验证码"); - } - - @Override - public void onError(Throwable e) { - if (getView() == null) { - return; - } - //异常,停止计时 - getView().setCodeBtnEnable(true); - getView().setCodeBtnText("获取验证码"); - getView().toast(e.getMessage()); - } - - @Override - public void onComplete() { - if (getView() == null) { - return; - } - getView().setCodeBtnEnable(true); - getView().setCodeBtnText("获取验证码"); - - } - }); - } - - @Override - protected void onFailure(String error) { - if (getView() != null) { - getView().dismissProgressDialog(); - getView().toast(error); - } - } - }); - - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java index f5c6803..8775a0b 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java @@ -9,8 +9,8 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseFragment; import com.fenghoo.seven.main.find.ui.FindFragmenttwo; -import com.fenghoo.seven.test.BaseFragment; /** * 发现 diff --git a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java index f6e7100..291fb52 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java @@ -10,7 +10,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseFragment; import com.fenghoo.seven.main.find.ui.PrivateletterFragment; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java index 8e308ba..beaf403 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseTreeFragment; import com.fenghoo.seven.main.find.adapter.QuestionsAdapter; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/CommentBean.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/CommentBean.java index 88dc43e..17f4ba9 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/CommentBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/CommentBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java index 5696d22..ba31f92 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java index efb7d7d..3250eca 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java @@ -1,8 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; - -import java.util.List; +import com.fenghoo.seven.base.BaseModel; public class Markquestionsone extends BaseModel { diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/StyleBean.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/StyleBean.java index 2e4c9c2..307cd92 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/StyleBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/StyleBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/commonWordsBean.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/commonWordsBean.java index 1a2b506..c9f2799 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/commonWordsBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/commonWordsBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java index c8e755e..76bea88 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/privateChatBean.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/privateChatBean.java index be4c878..db820ef 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/privateChatBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/privateChatBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/privateListBean.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/privateListBean.java index 76b6b66..7ef4032 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/entity/privateListBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/privateListBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.find.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java index 274aff6..aef3658 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java @@ -1,7 +1,7 @@ package com.fenghoo.seven.main.find.ui; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseBean; import com.fenghoo.seven.main.find.adapter.CommentAdapter; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java index c27e1e1..ee16d05 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java @@ -1,13 +1,10 @@ package com.fenghoo.seven.main.find.ui; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.main.find.ConversationActivity; import com.fenghoo.seven.main.find.adapter.PrivateletAdapter; import com.fenghoo.seven.main.find.entity.privateListBean; -import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; -import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo; import com.fenghoo.seven.main.kehu.fragment.MobanFragment; -import com.fenghoo.seven.main.kehu.activity.ShowAty; import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java index fa97920..ce9f021 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java @@ -6,7 +6,7 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.main.find.adapter.AwemeAdapter; import com.fenghoo.seven.main.kehu.Bean.awemeBean; import com.fenghoo.seven.main.kehu.activity.ShowAty; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CommitDesignModel.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CommitDesignModel.java index c206603..8e04e29 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CommitDesignModel.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CommitDesignModel.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; public class CommitDesignModel extends BaseModel { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java index d5e343e..847f824 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java index fc9e9be..833da4c 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBean.java index b7bf7f4..03ea90c 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBeantwo.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBeantwo.java index 21488c8..7e489fe 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBeantwo.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBeantwo.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/WorkDetailModel.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/WorkDetailModel.java index a335061..cf78bdb 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/WorkDetailModel.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/WorkDetailModel.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java index 1e01d31..8825d8b 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerDetailBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerDetailBean.java index 781fa10..58a94a2 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerDetailBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerDetailBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; /** * Time: 2020/8/17 diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerFPListBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerFPListBean.java index 250bc83..39941d3 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerFPListBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/customerFPListBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java index 3cbdbb8..2105d63 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/markingYiliushi.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/markingYiliushi.java index f59978e..440dbc5 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/markingYiliushi.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/markingYiliushi.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java index 397d2bc..f4d7051 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/uploadImgBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/uploadImgBean.java index edc7672..72db2db 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/uploadImgBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/uploadImgBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.kehu.Bean; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; public class uploadImgBean extends BaseModel { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java index 33b1d86..80dcfa2 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java @@ -10,25 +10,22 @@ import android.view.WindowManager; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.main.find.entity.commonWordsBean; import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; -import com.fenghoo.seven.utils.StringUtils; import com.fenghoo.seven.utils.WidgetTools; import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; -import java.util.ArrayList; import java.util.List; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java index e2ce9ec..384f370 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java @@ -7,7 +7,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; import com.fenghoo.seven.db.DbRecordBeanData; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java index dbfe4e1..2241d19 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java @@ -19,8 +19,8 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.listener.OnOptionsSelectListener; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.fenghoo.seven.GetJsonDataUtil; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.GetJsonDataUtil; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseTreeActivity; import com.fenghoo.seven.db.DbRecordBeanData; 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 164893b..0ce375f 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 @@ -5,7 +5,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; import com.fenghoo.seven.main.find.entity.Markquestionsone; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java index 5874de9..f90c628 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java @@ -11,7 +11,7 @@ import android.widget.Toast; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.listener.OnOptionsSelectListener; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.fenghoo.seven.GetJsonDataUtil; +import com.fenghoo.seven.utils.GetJsonDataUtil; import com.fenghoo.seven.R; import com.fenghoo.seven.main.kehu.Bean.JsonBeantwo; import com.google.gson.Gson; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java index 47ea440..0e389b8 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java @@ -7,6 +7,7 @@ import android.os.Bundle; import com.fenghoo.seven.db.DbRecordBeanData; import com.fenghoo.seven.main.activity.CodeLoginActivity; import com.fenghoo.seven.main.activity.ForgetPasActivity; +import com.fenghoo.seven.main.activity.LoginPasswordActivity; import com.fenghoo.seven.main.activity.ModifyPasActivity; import com.fenghoo.seven.main.find.CommentActivity; import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; @@ -82,6 +83,13 @@ public class ShowAty { i.putExtra("entertype",entertype); ctx.startActivity(i); } + + + public static void LoginPasswordActivity(Context ctx) { + Intent i = new Intent(ctx, LoginPasswordActivity.class); + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + ctx.startActivity(i); + } public static void ForgetPasActivity(Context ctx) { Intent i = new Intent(ctx, ForgetPasActivity.class); ctx.startActivity(i); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java index 85440ea..8a43d24 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java @@ -2,7 +2,7 @@ package com.fenghoo.seven.main.kehu.activity; import android.os.Bundle; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.main.find.adapter.StyleAdapter; import com.fenghoo.seven.main.find.entity.StyleBean; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java index ec614c4..4bb4526 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java @@ -12,11 +12,10 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseBean; import com.fenghoo.seven.main.find.entity.SixEvent; @@ -26,7 +25,6 @@ import com.fenghoo.seven.main.kehu.Bean.FirstEvent; import com.fenghoo.seven.main.kehu.Bean.LabelBean; import com.fenghoo.seven.main.kehu.Bean.SecondEvent; import com.fenghoo.seven.main.kehu.Bean.addCustomerBean; -import com.fenghoo.seven.main.kehu.activity.JsonDataActivity; import com.fenghoo.seven.main.kehu.activity.ShowAty; import com.fenghoo.seven.main.kehu.adapter.AddCusAdapter; import com.fenghoo.seven.okgonet.NetApi; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java index b81d55b..fd8cc40 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java @@ -5,7 +5,7 @@ import android.util.Log; import android.view.ViewParent; import android.widget.FrameLayout; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseBean; import com.fenghoo.seven.dialog.BaseTipsDialog; @@ -156,6 +156,8 @@ public class CustomerFragment extends MobanFragment { @Override public void requestData() { final HttpParams paramsPost = new HttpParams(); + String uuid = ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(); + Log.e("uuid==",uuid); paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); paramsPost.put("search", search); new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_customerList).subscribe(new Observer() { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java index 582fa01..6b5479a 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java @@ -4,10 +4,8 @@ import android.util.Log; import android.view.ViewParent; import android.widget.FrameLayout; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.main.find.entity.ThreeEvent; -import com.fenghoo.seven.main.kehu.Bean.FpListBean; -import com.fenghoo.seven.main.kehu.Bean.IndustryBean; import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo; import com.fenghoo.seven.main.kehu.Bean.orderListBean; import com.fenghoo.seven.main.kehu.activity.ShowAty; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java index 22d696e..46abb3f 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java @@ -4,7 +4,7 @@ import android.util.Log; import android.view.ViewParent; import android.widget.FrameLayout; -import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.main.find.entity.ThreeEvent; import com.fenghoo.seven.main.kehu.Bean.FpListBean; import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java index ae65035..a985c4d 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java @@ -13,9 +13,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseFragment; import com.fenghoo.seven.main.my.entity.Savaselect; import com.fenghoo.seven.main.kehu.activity.ShowAty; -import com.fenghoo.seven.test.BaseFragment; import com.google.android.material.tabs.TabLayout; import java.util.ArrayList; diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/XikeInfoBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/XikeInfoBean.java index dbc6920..ce0cc85 100644 --- a/app/src/main/java/com/fenghoo/seven/main/my/entity/XikeInfoBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/XikeInfoBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.my.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/funSetBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/funSetBean.java index c96fae4..de23114 100644 --- a/app/src/main/java/com/fenghoo/seven/main/my/entity/funSetBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/funSetBean.java @@ -1,6 +1,6 @@ package com.fenghoo.seven.main.my.entity; -import com.fenghoo.seven.test.BaseModel; +import com.fenghoo.seven.base.BaseModel; /** * Time: 2020/8/25 diff --git a/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/presenter/MyPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/presenter/MyPresenterImpl.java index 488d5de..2900261 100644 --- a/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/presenter/MyPresenterImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/presenter/MyPresenterImpl.java @@ -28,7 +28,8 @@ public class MyPresenterImpl extends MvpBasePresenter implement return; } getView().dismissProgressDialog(); - mModel.save(responseData); + if(!responseData.getMsg().equals("登录账号异常!")){ + mModel.save(responseData);} getView().refreshData(); } diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java index 9ef718a..3ee7acb 100644 --- a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java @@ -1,6 +1,13 @@ package com.fenghoo.seven.okgonet; +import com.fenghoo.seven.BaseApplication; +import com.fenghoo.seven.main.activity.LoginPasswordActivity; +import com.fenghoo.seven.main.find.ConversationActivity; +import com.fenghoo.seven.main.kehu.activity.ShowAty; +import com.fenghoo.seven.utils.JumpUtils; +import com.fenghoo.seven.utils.ToastUtils; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.cache.CacheMode; import com.lzy.okgo.convert.StringConvert; @@ -8,6 +15,9 @@ import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.lzy.okrx2.adapter.ObservableResponse; +import org.json.JSONException; +import org.json.JSONObject; + import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; @@ -38,6 +48,20 @@ public class NetApi { @Override public void onNext(@NonNull Response response) { + String body = (String) response.body(); + try { + JSONObject jsonObject = new JSONObject(body); + JSONObject result1 = jsonObject.getJSONObject("result"); + String success = result1.getString("success"); + String msg = result1.getString("msg"); + if(msg.equals("登录账号异常!")){ + ToastUtils.showToast(BaseApplication.getInstance(),"登录账号异常!"); + ShowAty.LoginPasswordActivity(BaseApplication.getInstance()); + return; + } + } catch (JSONException e) { + e.printStackTrace(); + } observer.onNext(response); } diff --git a/app/src/main/java/com/fenghoo/seven/test/BaseFragment.java b/app/src/main/java/com/fenghoo/seven/test/BaseFragment.java deleted file mode 100644 index ec4d6e6..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/BaseFragment.java +++ /dev/null @@ -1,231 +0,0 @@ -package com.fenghoo.seven.test; - - -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.Intent; -import android.content.res.Configuration; -import android.util.Log; -import android.util.TypedValue; -import android.widget.Toast; - -import com.fenghoo.seven.R; - -import androidx.annotation.IdRes; -import androidx.annotation.StringRes; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - - -/** - * 日期:2017.01.03 - *

- * 作者:xudiwei - *

- * 描述:BaseFragment添加了相关常用的方法。 - */ -public class BaseFragment extends Fragment { - - private static final String TAG = "BaseFragment"; - protected Context mContext; - protected Activity mActivity; - private ProgressDialog mProgressDialog; - private boolean isVisible; - - public BaseFragment() { - - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - mContext = context; - mActivity = getActivity(); - } - - - @Override - public void setUserVisibleHint(boolean isVisibleToUser) { - super.setUserVisibleHint(isVisibleToUser); - if (isVisibleToUser && !isVisible) { - isVisible = true; - onVisible(); - } else { - if (isVisible) { - isVisible = false; - onInvisible(); - } - } - Log.d(TAG, "setUserVisibleHint: " + isVisibleToUser); - } - - @Override - public void onResume() { - super.onResume(); - if (!isVisible) { - isVisible = true; - onVisible(); - } - } - - @Override - public void onPause() { - super.onPause(); - if (isVisible) { - isVisible = false; - onInvisible(); - } - } - - - /** - * Fragment可见时 - */ - protected void onVisible() { - Log.d(TAG, "onVisible"); - } - - /** - * Fragment不可见时 - */ - protected void onInvisible() { - Log.d(TAG, "onInvisible"); - } - - /** - * toast - * - * @param msg 吐丝的内容 - */ - public void toast(String msg) { - Toast.makeText(mContext, msg, Toast.LENGTH_SHORT).show(); - } - - /** - * toast - * - * @param ids 吐丝的内容的字符串ids - */ - public void toast(@StringRes int ids) { - toast(getString(ids)); - } - - - /** - * 线程安全的toast - * - * @param msg - */ - public void toastThreadSafe(final String msg) { - if (null != mActivity) { - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - toast(msg); - } - }); - } - } - - /** - * 线程安全的toast - * - * @param ids - */ - public void toastThreadSafe(@StringRes final int ids) { - if (null != mActivity) { - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - toast(ids); - } - }); - } - } - - /** - * 开启一个Activity - * - * @param clz 需要开启的Activity - */ - public void startActivity(Class clz) { - if (null != mContext) { - startActivity(new Intent(mContext, clz)); -// getActivity().overridePendingTransition(R.anim.trans_next_in,R.anim.trans_next_out); - } - } - - /** - * 开启一个Activity,并finish掉当前的Activity - * - * @param clz - */ - public void startActivityAndFinishSelf(Class clz) { - if (null != mActivity) { - startActivity(clz); - mActivity.finish(); - } - - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - } - - /** - * 初始化进度对话框 - */ - protected void showProgressDialog(String dialogMessage) { - mProgressDialog = new ProgressDialog(mContext); - mProgressDialog.setCanceledOnTouchOutside(false); - mProgressDialog.setMessage(dialogMessage); - mProgressDialog.show(); - } -// -// @Override -// public void onHiddenChanged(boolean hidden) { -// super.onHiddenChanged(hidden); -// Log.d(TAG, "onHiddenChanged: "+hidden); -// isVisible = !hidden; -// if(isVisible){ -// onVisible(); -// }else { -// onInvisible(); -// } -// } - - /** - * 关闭进度对话框 - */ - protected void dismissProgressDialog() { - if (null != mProgressDialog && mProgressDialog.isShowing()) { - mProgressDialog.dismiss(); - } - } - - /** - * 初始化刷新控件的参数 - * - * @param ids 刷新控件的id - */ - protected SwipeRefreshLayout setSwipeRefreshLayout(@IdRes int ids) { - SwipeRefreshLayout mRefreshLayout = (SwipeRefreshLayout) getView().findViewById(ids); - mRefreshLayout.setProgressViewOffset(false, 0, - (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24, getResources().getDisplayMetrics())); - mRefreshLayout.setColorSchemeResources(R.color.colorGreen); - return mRefreshLayout; - } - - - /** - * 隐藏键盘 - */ - public void hideKB() { -// if (null != mContext && mContext instanceof BaseActivity) { -// ((BaseActivity) mContext).hintKb(); -// } - } - -} diff --git a/app/src/main/java/com/fenghoo/seven/test/BaseMvpFragment.java b/app/src/main/java/com/fenghoo/seven/test/BaseMvpFragment.java deleted file mode 100644 index 70e7107..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/BaseMvpFragment.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fenghoo.seven.test; - - -import android.util.Log; - - -/** - * 日期:2017.01.03 - *

- * 作者:xudiwei - *

- * 描述:所有MVP模式的Fragment的父类,处理了在MVP里有可能造成内存泄漏的可能 - */ -public abstract class BaseMvpFragment> extends BaseFragment { - - private static final String TAG = "BaseMvpFragment"; - protected P mPresenter; - - public BaseMvpFragment() { - // Required empty public constructor - Log.d(TAG, "constructor"); - mPresenter = createPresenter(); - mPresenter.attach((V) this); - } - - @Override - public void onDestroy() { - super.onDestroy(); - mPresenter.detach(); - } - - /** - * 子类复写此方法,返回BasePresenter的子类 - * - * @return - */ - protected abstract P createPresenter(); - -} diff --git a/app/src/main/java/com/fenghoo/seven/test/BasePresenter.java b/app/src/main/java/com/fenghoo/seven/test/BasePresenter.java deleted file mode 100644 index 0ac4c05..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/BasePresenter.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.fenghoo.seven.test; - -import java.lang.ref.WeakReference; - -/** - * 日期:2017.01.03 - *

- * 作者:xudiwei - *

- * 描述:所有Presenter的父类,处理了在MVP里有可能造成内存泄漏的可能 - */ -public class BasePresenter { - - private WeakReference mReference; - - /** - * 调用此方法添加View的引用到一个弱引用里 - * - * @param v - */ - public void attach(V v) { - mReference = new WeakReference(v); - } - - /** - * 调用此方法移除View的引用 - */ - public void detach() { - if (null != mReference) { - mReference.clear(); - mReference = null; - } - } - - /** - * 获取View对象 - * - * @return - */ - public V getView() { - if (null != mReference) { - return mReference.get(); - } - return null; - } - -} diff --git a/app/src/main/java/com/fenghoo/seven/test/BaseRecyclerViewAdapter.java b/app/src/main/java/com/fenghoo/seven/test/BaseRecyclerViewAdapter.java deleted file mode 100644 index cfe6df1..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/BaseRecyclerViewAdapter.java +++ /dev/null @@ -1,213 +0,0 @@ -package com.fenghoo.seven.test; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.fenghoo.seven.R; - -import java.util.List; - -import androidx.recyclerview.widget.RecyclerView; - -/** - * Created by Administrator on 2016/12/26. - *

- * 作者:xudiwei - *

- * 描述:RecyclerView的BaseAdapter - */ - -public abstract class BaseRecyclerViewAdapter extends RecyclerView.Adapter { - - /*普通的item类型*/ - protected static final int ITEM_TYPE_NORMAL = 0; - /*加载更多的item类型*/ - protected static final int ITEM_TYPE_LOAD_MORE = -1; - private static final String TAG = "BaseRecyclerViewAdapter"; - /*每页数据条数*/ - public int limit = 10; - protected Context mContext; - protected List mList; - /*item点击监听器*/ - protected OnItemClickListener mListener; - /*是否还有更多数据可加载*/ - private boolean hasLoadMore = true; - - - public BaseRecyclerViewAdapter(Context context, List list) { - this.mContext = context; - this.mList = list; - - } - - /** - * 设置每页条数 - * - * @param limit - */ - public void setLimit(int limit) { - this.limit = limit; - } - - - /** - * 更新数据 - * - * @param list - * @deprecated - */ - public void upData(List list) { - this.mList = list; - notifyDataSetChanged(); - } - - /** - * 追加数据并更新 - * - * @param list - * @deprecated - */ - public void upDataAdd(List list) { - if (list != null) { - mList.addAll(list); - } - notifyDataSetChanged(); - } - - - @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - if (viewType == ITEM_TYPE_LOAD_MORE) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_load_more, parent, false); - return new LoadMoreViewHolder(view); - } else { - return onCreateViewHolderNormalItem(parent, viewType); - } - -// if (viewType == ITEM_TYPE_NORMAL) { -// return onCreateViewHolderNormalItem(parent, viewType); -// } else { -// View view = LayoutInflater.from(mContext).inflate(R.layout.item_load_more, parent, false); -// return new LoadMoreViewHolder(view); -// } - } - - @Override - public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { - if (position == mList.size()) { - //bind load more view - LoadMoreViewHolder loadMoreViewHolder = ((LoadMoreViewHolder) holder); - if (hasLoadMore) { - loadMoreViewHolder.tvLoadMore.setText("sdfds"); - } else { - loadMoreViewHolder.tvLoadMore.setText("sdfds"); - } - } else { - //bind normal view - onBindViewHolderNormalItem(holder, position); - } - } - - /** - * 填充普通的item数据 - * - * @param holder - * @param position - */ - public abstract void onBindViewHolderNormalItem(RecyclerView.ViewHolder holder, int position); - - /** - * 创建普通的item view holder - * - * @param parent - * @param viewType - * @return - */ - public abstract RecyclerView.ViewHolder onCreateViewHolderNormalItem(ViewGroup parent, int viewType); - - @Override - public int getItemCount() { - //只有集合不为空的情况下才默认添加最后一条加载更多的布局item - if (mList == null) { - return 0; - } else { - //数据小于limit条时不显示加载更多 - if (mList.size() < limit) { - return mList.size(); - } else { - return mList.size() + 1; - } - } - } - - - @Override - public int getItemViewType(int position) { - if (position == mList.size()) { - return ITEM_TYPE_LOAD_MORE; - } - return ITEM_TYPE_NORMAL; - } - - /** - * 通知数据改变,通过调用此方法实现数据改变刷新 - * - * @param hasLoadMore 是否还有更多数据加载,true表示为有更多数据 - * 这时滑到最后一条item显示的是“加载更多中” 当为false - * 表示没有更多数据了。这时滑到最后一条item.显示“没有更多数据了” - */ - public void myNotifyDataSetChanged(boolean hasLoadMore) { - this.hasLoadMore = hasLoadMore; - this.notifyDataSetChanged(); - } - - /** - * ItemView点击 - * - * @param normalItemView - * @param viewHolder - */ - protected void setItemClick(final View normalItemView, final RecyclerView.ViewHolder viewHolder) { - if (null != mListener) { - normalItemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mListener.onItemClick(normalItemView, viewHolder.getLayoutPosition()); - } - }); - } - } - - /** - * 设置item点击事件监听器 - * - * @param listener - */ - public void setOnItemClickListener(OnItemClickListener listener) { - this.mListener = listener; - } - - /** - * item点击事件回调接口{@link #setOnItemClickListener(OnItemClickListener)} - */ - public interface OnItemClickListener { - void onItemClick(View view, int position); - } - - /** - * 加载更多的ViewHolder - */ - private class LoadMoreViewHolder extends RecyclerView.ViewHolder { - TextView tvLoadMore; - - public LoadMoreViewHolder(View itemView) { - super(itemView); - tvLoadMore = (TextView) itemView.findViewById(R.id.tv_loadmore); - } - } - - -} diff --git a/app/src/main/java/com/fenghoo/seven/test/CommunityMessageBean.java b/app/src/main/java/com/fenghoo/seven/test/CommunityMessageBean.java deleted file mode 100644 index e883484..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/CommunityMessageBean.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.fenghoo.seven.test; - -import java.util.List; - -/** - * Created by: xudiwei - *

- * on: 2017/5/9. - *

- * 描述:社群消息实体类 - */ - -public class CommunityMessageBean { - - //系统消息 - private List systemMsg; - //邀请消息 - private List inviteMsg; - //审核消息 - private List checkMsg; - - public List getSystemMsg() { - return systemMsg; - } - - public void setSystemMsg(List systemMsg) { - this.systemMsg = systemMsg; - } - - public List getInviteMsg() { - return inviteMsg; - } - - public void setInviteMsg(List inviteMsg) { - this.inviteMsg = inviteMsg; - } - - public List getCheckMsg() { - return checkMsg; - } - - public void setCheckMsg(List checkMsg) { - this.checkMsg = checkMsg; - } - - public static class MsgBean { - - /** - * rcd_id : 129 - * key_id : 129 - * user_id : 0 - * nick_name : - * user_identify : 0 - * group_id : 1 - * group_name : 听说iOS很牛逼? - * im_group_id : ab97e028a5aae8d637cb1a70569638d7 - * squad_id : 0 - * squad_name : - * squad_im_group_id : 0 - * img : /Uploads/app_class_img/info_page_size/20170519/591eb5f8cf821.png - * title : null - * content : 申请加入 - * msg_type : 6 - * status : 1 - * add_time : 1495166305 - */ - - private String rcd_id; - private String key_id; - private int user_id; - private String nick_name; - private String user_identify; - private String group_id; - private String group_name; - private String im_group_id; - private int squad_id; - private String squad_name; - private String squad_im_group_id; - private String img; - private String title; - private String content; - private int msg_type; - private String status; - private String add_time; - - public String getRcd_id() { - return rcd_id; - } - - public void setRcd_id(String rcd_id) { - this.rcd_id = rcd_id; - } - - public String getKey_id() { - return key_id; - } - - public void setKey_id(String key_id) { - this.key_id = key_id; - } - - public int getUser_id() { - return user_id; - } - - public void setUser_id(int user_id) { - this.user_id = user_id; - } - - public String getNick_name() { - return nick_name; - } - - public void setNick_name(String nick_name) { - this.nick_name = nick_name; - } - - public String getUser_identify() { - return user_identify; - } - - public void setUser_identify(String user_identify) { - this.user_identify = user_identify; - } - - public String getGroup_id() { - return group_id; - } - - public void setGroup_id(String group_id) { - this.group_id = group_id; - } - - public String getGroup_name() { - return group_name; - } - - public void setGroup_name(String group_name) { - this.group_name = group_name; - } - - public String getIm_group_id() { - return im_group_id; - } - - public void setIm_group_id(String im_group_id) { - this.im_group_id = im_group_id; - } - - public int getSquad_id() { - return squad_id; - } - - public void setSquad_id(int squad_id) { - this.squad_id = squad_id; - } - - public String getSquad_name() { - return squad_name; - } - - public void setSquad_name(String squad_name) { - this.squad_name = squad_name; - } - - public String getSquad_im_group_id() { - return squad_im_group_id; - } - - public void setSquad_im_group_id(String squad_im_group_id) { - this.squad_im_group_id = squad_im_group_id; - } - - public String getImg() { - return img; - } - - public void setImg(String img) { - this.img = img; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public int getMsg_type() { - return msg_type; - } - - public void setMsg_type(int msg_type) { - this.msg_type = msg_type; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getAdd_time() { - return add_time; - } - - public void setAdd_time(String add_time) { - this.add_time = add_time; - } - } -} diff --git a/app/src/main/java/com/fenghoo/seven/test/IInviteMessagePresenter.java b/app/src/main/java/com/fenghoo/seven/test/IInviteMessagePresenter.java deleted file mode 100644 index 1f266bf..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/IInviteMessagePresenter.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.fenghoo.seven.test; - - - -import java.util.List; - -/** - * Created by: xudiwei - *

- * on: 2017/5/9. - *

- * 描述::邀请消息Fragment的presenter接口 - */ -public interface IInviteMessagePresenter { - - /** - * 获取邀请消息刷新 - */ - void getInviteMessageRefresh(getstore inviteMessages); - - /** - * 获取邀请消息加载更多 - */ - void getInviteMessageLoadMore(List inviteMessages); -} diff --git a/app/src/main/java/com/fenghoo/seven/test/IInviteMessageView.java b/app/src/main/java/com/fenghoo/seven/test/IInviteMessageView.java deleted file mode 100644 index f8b9477..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/IInviteMessageView.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.fenghoo.seven.test; - -/** - * Created by: xudiwei - *

- * on: 2017/5/9. - *

- * 描述::邀请消息Fragment的 view接口 - */ -public interface IInviteMessageView { - - /** - * 获取消息结果回调 - * @param isSuccess 获取消息是否成功 - * @param hasMore 是还可加载更多 - * @param errorMsg 错误信息 - */ - void getMessageResult(boolean isSuccess, boolean hasMore, String errorMsg); - - void showTextview(getstore inviteMessages); -} diff --git a/app/src/main/java/com/fenghoo/seven/test/InviteMessageAdapter.java b/app/src/main/java/com/fenghoo/seven/test/InviteMessageAdapter.java deleted file mode 100644 index 61b70bf..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/InviteMessageAdapter.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.fenghoo.seven.test; - -import android.content.Context; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.fenghoo.seven.R; - -import java.util.List; - -import androidx.recyclerview.widget.RecyclerView; - - -/** - * Created by: xudiwei - *

- * on: 2017/5/9. - *

- * 描述:邀请消息列表适配器 - * @deprecated - */ - -public class InviteMessageAdapter extends BaseRecyclerViewAdapter { - private static final String TAG = "InviteMessageAdapter"; - - public InviteMessageAdapter(Context context, List list) { - super(context, list); - } - - @Override - public void onBindViewHolderNormalItem(RecyclerView.ViewHolder holder, int position) { - AddFriendMessageViewHolder viewHolder = (AddFriendMessageViewHolder) holder; - CommunityMessageBean.MsgBean msgBean = mList.get(position); - viewHolder.tvNickname.setText(msgBean.getNick_name()); - viewHolder.tvReason.setText(msgBean.getContent()); - Log.d(TAG, "msg: " + msgBean.getImg()); - } - - @Override - public RecyclerView.ViewHolder onCreateViewHolderNormalItem(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(mContext).inflate(R.layout.item_rv_add_friend_message, parent, false); - return new AddFriendMessageViewHolder(view); - } - - private class AddFriendMessageViewHolder extends RecyclerView.ViewHolder { - TextView tvNickname; - TextView tvReason; - TextView tvAccept; - TextView tvReject; - - - AddFriendMessageViewHolder(View itemView) { - super(itemView); - tvNickname = (TextView) itemView.findViewById(R.id.tv_nickname); - tvReason = (TextView) itemView.findViewById(R.id.tv_reason); - tvAccept = (TextView) itemView.findViewById(R.id.tv_accept); - tvReject = (TextView) itemView.findViewById(R.id.tv_reject); - } - } -} diff --git a/app/src/main/java/com/fenghoo/seven/test/RLListPager.java b/app/src/main/java/com/fenghoo/seven/test/RLListPager.java deleted file mode 100644 index 8910e8d..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/RLListPager.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.fenghoo.seven.test; - -import android.content.Context; -import android.util.AttributeSet; -import android.util.TypedValue; -import android.view.ViewGroup; -import android.widget.FrameLayout; - -import com.fenghoo.seven.R; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - - -/** - * 日期:2017.01.21 - *

- * 作者:xudiwei - *

- * 描述:SwipeRefreshLayout 与RecyclerView的组合控件 - */ -public class RLListPager extends FrameLayout { - - private static final String TAG = "RLListPager"; - - private SwipeRefreshLayout mRefreshLayout; - private RecyclerView mRecyclerView; - private OnRLRefreshAndLoadMoreListener mListener; - private int loadMoreLimit = 5; - - public RLListPager(Context context) { - this(context, null); - } - - public RLListPager(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public RLListPager(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initView(); - } - - private void initView() { - //刷新布局 - mRefreshLayout = new SwipeRefreshLayout(getContext()); - mRefreshLayout.setOnRefreshListener(new MyOnRefreshListener()); - mRefreshLayout.setProgressViewOffset(true, 0, - (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 80, getResources().getDisplayMetrics())); - mRefreshLayout.setColorSchemeResources(R.color.colorGreen); - - //列表布局 - mRecyclerView = new RecyclerView(getContext()); - mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - mRefreshLayout.addView(mRecyclerView, new SwipeRefreshLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT)); - - this.addView(mRefreshLayout, new LayoutParams(LayoutParams.MATCH_PARENT, - LayoutParams.MATCH_PARENT)); - - mRecyclerView.addOnScrollListener(new MyOnScrollListener()); - - } - - public RecyclerView getRecyclerView() { - return mRecyclerView; - } - - /** - * 设置适配器 - * - * @param adapter - */ - public void setAdapter(RecyclerView.Adapter adapter) { - mRecyclerView.setAdapter(adapter); - } - - /** - * 设置刷新动画 - * - * @param refreshing - */ - public void setRefresh(boolean refreshing) { - mRefreshLayout.setRefreshing(refreshing); - } - - public boolean isRefresh() { - return mRefreshLayout.isRefreshing(); - } - - public int getLoamoreLimit() { - return loadMoreLimit; - } - - /** - * 设置触发上拉加载更多的最少item默认为5个item才能触发 - * - * @param loadMoreLimit - */ - public void setloadmoreLimit(int loadMoreLimit) { - this.loadMoreLimit = loadMoreLimit; - } - - /** - * 刷新 - */ - private class MyOnRefreshListener implements SwipeRefreshLayout.OnRefreshListener { - @Override - public void onRefresh() { - //刷新布局 - if (null != mListener) { - mListener.onRefresh(); - } - } - } - - /** - * 加载更多 - */ - private class MyOnScrollListener extends RecyclerView.OnScrollListener { - private LinearLayoutManager mLayoutManager; - - @Override - public void onScrollStateChanged(RecyclerView recyclerView, int newState) { - super.onScrollStateChanged(recyclerView, newState); - - if (newState == RecyclerView.SCROLL_STATE_IDLE) { - if (null == mLayoutManager) { - mLayoutManager = (LinearLayoutManager) recyclerView.getLayoutManager(); - } - RecyclerView.Adapter adapter = recyclerView.getAdapter(); - if (null != adapter) { - int itemCount = adapter.getItemCount(); - if (itemCount > loadMoreLimit && mLayoutManager.findLastVisibleItemPosition() == itemCount - 1) { - - //加载更多 - if (null != mListener) { - mListener.onLoadMore(); - } - } - } - - } - } - - } - - public void scrollToPositionWithOffset(int position,int offset){ - mRecyclerView.scrollToPosition(position); - mRecyclerView.scrollBy(0,offset); - - } - - public void setOnRLRefreshAndLoadMoreListener(OnRLRefreshAndLoadMoreListener listener) { - this.mListener = listener; - } - - /** - * 刷新加载更多回调接口 - */ - public interface OnRLRefreshAndLoadMoreListener { - - /** - * 下拉刷新时回调 - */ - void onRefresh(); - - /** - * 上拉加载更多时回调 - */ - void onLoadMore(); - } -} diff --git a/app/src/main/java/com/fenghoo/seven/test/getstore.java b/app/src/main/java/com/fenghoo/seven/test/getstore.java deleted file mode 100644 index 8f45352..0000000 --- a/app/src/main/java/com/fenghoo/seven/test/getstore.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.fenghoo.seven.test; - - -import java.util.List; - -/** - * 项目名:MenDian - * 包名:com.fanghoo.mendian.module.data - * 创建者:任剑波 - * 创建时间:2018/9/9 10:30 - * 描述:TODO - */ -public class getstore extends BaseModel { - - /** - * status : 0 - * result : {"success":0,"msg":"获取信息成功","data":[{"store_id":"dd3520f0f40726b849d7cdd7a623e06e","store_name":"店铺3"}]} - */ - - - - /** - * success : 0 - * msg : 获取信息成功 - * data : [{"store_id":"dd3520f0f40726b849d7cdd7a623e06e","store_name":"店铺3"}] - */ - - private int success; - private String msg; - private List data; - - public int getSuccess() { - return success; - } - - public void setSuccess(int success) { - this.success = success; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - /** - * store_id : dd3520f0f40726b849d7cdd7a623e06e - * store_name : 店铺3 - */ - - private String store_id; - private String store_name; - - public String getStore_id() { - return store_id; - } - - public void setStore_id(String store_id) { - this.store_id = store_id; - } - - public String getStore_name() { - return store_name; - } - - public void setStore_name(String store_name) { - this.store_name = store_name; - } - } - -} diff --git a/app/src/main/java/com/fenghoo/seven/GetJsonDataUtil.java b/app/src/main/java/com/fenghoo/seven/utils/GetJsonDataUtil.java similarity index 96% rename from app/src/main/java/com/fenghoo/seven/GetJsonDataUtil.java rename to app/src/main/java/com/fenghoo/seven/utils/GetJsonDataUtil.java index 330d5b2..970cb77 100644 --- a/app/src/main/java/com/fenghoo/seven/GetJsonDataUtil.java +++ b/app/src/main/java/com/fenghoo/seven/utils/GetJsonDataUtil.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven; +package com.fenghoo.seven.utils; import android.content.Context; import android.content.res.AssetManager; diff --git a/app/src/main/java/com/fenghoo/seven/JsonUtils.java b/app/src/main/java/com/fenghoo/seven/utils/JsonUtils.java similarity index 99% rename from app/src/main/java/com/fenghoo/seven/JsonUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/JsonUtils.java index 4aa9349..fa666ed 100644 --- a/app/src/main/java/com/fenghoo/seven/JsonUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/JsonUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.fenghoo.seven; +package com.fenghoo.seven.utils; import com.google.gson.Gson; diff --git a/app/src/main/java/com/fenghoo/seven/view/webview/WebActivitytwo.java b/app/src/main/java/com/fenghoo/seven/view/webview/WebActivitytwo.java deleted file mode 100644 index 9eebb17..0000000 --- a/app/src/main/java/com/fenghoo/seven/view/webview/WebActivitytwo.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.fenghoo.seven.view.webview; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -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.fenghoo.seven.R; -import com.fenghoo.seven.base.BaseActivity; - -public class WebActivitytwo extends BaseActivity implements View.OnClickListener { - public final static String URL = "url"; - public final static String TITLE = "title"; - private WebView webView; - private ProgressBar pb; - private RelativeLayout mLayTopLeftTv; - private TextView mLayTopTitle; - private TextView mRight; - private ImageView mIvCode; - private ProgressBar mPb; - private WebView mWebView; - - public static void runActivity(Context context, String title, String url) { - Intent intent = new Intent(context, WebActivitytwo.class); - intent.putExtra(URL, url); - intent.putExtra(TITLE, title); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_webtwo); - String url = getIntent().getStringExtra(URL); - String title = getIntent().getStringExtra(TITLE); - - initView(); - pb.setMax(100); - - WebSettings webSettings = webView.getSettings(); - webSettings.setDomStorageEnabled(true);//主要是这句 - webSettings.setJavaScriptEnabled(true);//启用js - webSettings.setBlockNetworkImage(false);//解决图片不显示 - webSettings.setJavaScriptCanOpenWindowsAutomatically(true); - webSettings.setLoadsImagesAutomatically(true); - webSettings.setAppCacheEnabled(true); - webSettings.setCacheMode(WebSettings.LOAD_DEFAULT); -// webView.getSettings().setJavaScriptEnabled(true); - webSettings.setSupportZoom(true); - webSettings.setBuiltInZoomControls(true); - webView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - pb.setProgress(newProgress); - if (newProgress >= 100) { - pb.setVisibility(View.GONE); - } - } - }); - - webView.setWebViewClient(new WebViewClient() { - @Override - public boolean shouldOverrideUrlLoading(WebView view, String url) { - view.loadUrl(url); - return true; - } - }); - webView.loadUrl(url); - - } - - private void initView() { - webView = (WebView) findViewById(R.id.webView); - webView.setOnClickListener(this); - pb = (ProgressBar) findViewById(R.id.pb); - mLayTopLeftTv = (RelativeLayout) findViewById(R.id.layTop_left_tv); - mLayTopLeftTv.setOnClickListener(this); - mLayTopTitle = (TextView) findViewById(R.id.layTop_title); - mRight = (TextView) findViewById(R.id.right); - mIvCode = (ImageView) findViewById(R.id.iv_code); - mPb = (ProgressBar) findViewById(R.id.pb); - mWebView = (WebView) findViewById(R.id.webView); - mLayTopTitle.setText("云观店"); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - default: - break; - case R.id.webView: - break; - case R.id.layTop_left_tv: - finish(); - break; - } - } -} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml deleted file mode 100644 index 7405994..0000000 --- a/app/src/main/res/layout/activity_login.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -