diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e3b6390..fa33cc3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.fenghoo.seven"> @@ -8,7 +8,7 @@ - - - + + + @@ -27,10 +27,10 @@ - - + + @@ -40,16 +40,16 @@ @@ -59,24 +59,24 @@ - + @@ -87,13 +87,18 @@ + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/administrator/seven/db/DbBean.java b/app/src/main/java/com/example/administrator/seven/db/DbBean.java deleted file mode 100644 index dfac3f6..0000000 --- a/app/src/main/java/com/example/administrator/seven/db/DbBean.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.administrator.seven.db; - -public class DbBean { -} diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/mine/InboundHistoryResBean.java b/app/src/main/java/com/example/administrator/seven/main/entity/mine/InboundHistoryResBean.java deleted file mode 100644 index 389ab37..0000000 --- a/app/src/main/java/com/example/administrator/seven/main/entity/mine/InboundHistoryResBean.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.administrator.seven.main.entity.mine; - -public class InboundHistoryResBean { -} diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/mine/MessageNoticeResBean.java b/app/src/main/java/com/example/administrator/seven/main/entity/mine/MessageNoticeResBean.java deleted file mode 100644 index 4a15541..0000000 --- a/app/src/main/java/com/example/administrator/seven/main/entity/mine/MessageNoticeResBean.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.administrator.seven.main.entity.mine; - - -public class MessageNoticeResBean { - - -} diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/mine/OutboundHistoryResBean.java b/app/src/main/java/com/example/administrator/seven/main/entity/mine/OutboundHistoryResBean.java deleted file mode 100644 index 5af1e7e..0000000 --- a/app/src/main/java/com/example/administrator/seven/main/entity/mine/OutboundHistoryResBean.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.administrator.seven.main.entity.mine; - -public class OutboundHistoryResBean { -} diff --git a/app/src/main/java/com/example/administrator/seven/BaseApplication.java b/app/src/main/java/com/fenghoo/seven/BaseApplication.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/BaseApplication.java rename to app/src/main/java/com/fenghoo/seven/BaseApplication.java index ff1c085..41af145 100644 --- a/app/src/main/java/com/example/administrator/seven/BaseApplication.java +++ b/app/src/main/java/com/fenghoo/seven/BaseApplication.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven; +package com.fenghoo.seven; import android.app.Application; import android.content.Context; -import com.example.administrator.seven.db.dao.DataBaseHelper; -import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.fenghoo.seven.db.dao.DataBaseHelper; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.cache.CacheEntity; import com.lzy.okgo.cache.CacheMode; diff --git a/app/src/main/java/com/example/administrator/seven/FHConfig.java b/app/src/main/java/com/fenghoo/seven/FHConfig.java similarity index 89% rename from app/src/main/java/com/example/administrator/seven/FHConfig.java rename to app/src/main/java/com/fenghoo/seven/FHConfig.java index d2e9ca6..91fbc10 100644 --- a/app/src/main/java/com/example/administrator/seven/FHConfig.java +++ b/app/src/main/java/com/fenghoo/seven/FHConfig.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven; +package com.fenghoo.seven; /** * 蜂狐配置参数 diff --git a/app/src/main/java/com/example/administrator/seven/GetJsonDataUtil.java b/app/src/main/java/com/fenghoo/seven/GetJsonDataUtil.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/GetJsonDataUtil.java rename to app/src/main/java/com/fenghoo/seven/GetJsonDataUtil.java index 0a56a2b..330d5b2 100644 --- a/app/src/main/java/com/example/administrator/seven/GetJsonDataUtil.java +++ b/app/src/main/java/com/fenghoo/seven/GetJsonDataUtil.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven; +package com.fenghoo.seven; import android.content.Context; import android.content.res.AssetManager; diff --git a/app/src/main/java/com/example/administrator/seven/JsonUtils.java b/app/src/main/java/com/fenghoo/seven/JsonUtils.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/JsonUtils.java rename to app/src/main/java/com/fenghoo/seven/JsonUtils.java index e0b8c3a..4aa9349 100644 --- a/app/src/main/java/com/example/administrator/seven/JsonUtils.java +++ b/app/src/main/java/com/fenghoo/seven/JsonUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.administrator.seven; +package com.fenghoo.seven; import com.google.gson.Gson; diff --git a/app/src/main/java/com/example/administrator/seven/base/BaseActivity.java b/app/src/main/java/com/fenghoo/seven/base/BaseActivity.java similarity index 94% rename from app/src/main/java/com/example/administrator/seven/base/BaseActivity.java rename to app/src/main/java/com/fenghoo/seven/base/BaseActivity.java index b31f2f8..95c43a1 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BaseActivity.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import android.Manifest; import android.app.Activity; @@ -16,12 +16,12 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.example.administrator.seven.R; -import com.example.administrator.seven.dialog.LoadingDialog; -import com.example.administrator.seven.dialog.PersonnelDialogHelptwo; -import com.example.administrator.seven.utils.NetUtils; -import com.example.administrator.seven.utils.StatusBarUtil; -import com.example.administrator.seven.utils.ToastUtils; +import com.fenghoo.seven.R; +import com.fenghoo.seven.dialog.LoadingDialog; +import com.fenghoo.seven.dialog.PersonnelDialogHelptwo; +import com.fenghoo.seven.utils.NetUtils; +import com.fenghoo.seven.utils.StatusBarUtil; +import com.fenghoo.seven.utils.ToastUtils; import androidx.annotation.ColorRes; import androidx.core.app.ActivityCompat; diff --git a/app/src/main/java/com/example/administrator/seven/base/BaseBean.java b/app/src/main/java/com/fenghoo/seven/base/BaseBean.java similarity index 82% rename from app/src/main/java/com/example/administrator/seven/base/BaseBean.java rename to app/src/main/java/com/fenghoo/seven/base/BaseBean.java index 912117a..5a9f121 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BaseBean.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseBean.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import java.io.Serializable; diff --git a/app/src/main/java/com/example/administrator/seven/base/BaseFragment.java b/app/src/main/java/com/fenghoo/seven/base/BaseFragment.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/base/BaseFragment.java rename to app/src/main/java/com/fenghoo/seven/base/BaseFragment.java index 538e5a5..013bb3e 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BaseFragment.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import android.Manifest; import android.app.Activity; diff --git a/app/src/main/java/com/example/administrator/seven/base/BaseRecycleAdapter.java b/app/src/main/java/com/fenghoo/seven/base/BaseRecycleAdapter.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/base/BaseRecycleAdapter.java rename to app/src/main/java/com/fenghoo/seven/base/BaseRecycleAdapter.java index 38949aa..ba56fd8 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BaseRecycleAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseRecycleAdapter.java @@ -1,18 +1,18 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import java.util.ArrayList; import java.util.List; import androidx.recyclerview.widget.RecyclerView; -import static com.example.administrator.seven.common.Constants.LIMIT; +import static com.fenghoo.seven.common.Constants.LIMIT; /** diff --git a/app/src/main/java/com/example/administrator/seven/base/BaseTreeActivity.java b/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java similarity index 82% rename from app/src/main/java/com/example/administrator/seven/base/BaseTreeActivity.java rename to app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java index b2461ee..1916ef8 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BaseTreeActivity.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java @@ -1,9 +1,8 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.graphics.Color; import android.os.Bundle; import android.util.TypedValue; import android.view.View; @@ -12,8 +11,10 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.Toast; -import com.example.administrator.seven.R; -import com.example.administrator.seven.dialog.LoadingDialogy; +import com.fenghoo.seven.R; +import com.fenghoo.seven.dialog.LoadingDialogy; +import com.fenghoo.seven.utils.StatusBarUtil; +import com.fenghoo.seven.widget.TitleBar; import com.hannesdorfmann.mosby3.mvp.MvpActivity; import com.hannesdorfmann.mosby3.mvp.MvpPresenter; import com.hannesdorfmann.mosby3.mvp.MvpView; @@ -30,7 +31,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; * Created by LeiXiaoXing on 2017/3/14 09:54 */ -public abstract class BaseTreeActivity> extends MvpActivity implements BaseTreeView { +public abstract class BaseTreeActivity> extends MvpActivity implements BaseTreeView { private final String TAG = getClass().getSimpleName(); protected Context mContext; private LoadingDialogy mProgressDialog; @@ -40,6 +41,8 @@ public abstract class BaseTreeActivity> extends MvpFragment { +public abstract class BaseTreeFragment> extends MvpFragment implements View.OnClickListener{ protected final String TAG = getClass().getSimpleName(); protected Context mContext; @@ -42,6 +42,9 @@ public abstract class BaseTreeFragment= MIN_CLICK_DELAY_TIME) { + flag = true; + } + lastClickTime = curClickTime; + return flag; + } + /** * 获取Fragment布局文件id * diff --git a/app/src/main/java/com/example/administrator/seven/base/BaseTreeView.java b/app/src/main/java/com/fenghoo/seven/base/BaseTreeView.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/base/BaseTreeView.java rename to app/src/main/java/com/fenghoo/seven/base/BaseTreeView.java index 625a2bd..b38e1e9 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BaseTreeView.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseTreeView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import android.app.Activity; diff --git a/app/src/main/java/com/example/administrator/seven/base/BaseViewHolder.java b/app/src/main/java/com/fenghoo/seven/base/BaseViewHolder.java similarity index 93% rename from app/src/main/java/com/example/administrator/seven/base/BaseViewHolder.java rename to app/src/main/java/com/fenghoo/seven/base/BaseViewHolder.java index 5e52fe7..2e079fe 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BaseViewHolder.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseViewHolder.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import android.view.View; diff --git a/app/src/main/java/com/example/administrator/seven/base/BasetwoFragment.java b/app/src/main/java/com/fenghoo/seven/base/BasetwoFragment.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/base/BasetwoFragment.java rename to app/src/main/java/com/fenghoo/seven/base/BasetwoFragment.java index 8b16d34..d62a46e 100644 --- a/app/src/main/java/com/example/administrator/seven/base/BasetwoFragment.java +++ b/app/src/main/java/com/fenghoo/seven/base/BasetwoFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.base; +package com.fenghoo.seven.base; import android.app.Activity; import android.content.Context; @@ -12,9 +12,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import com.example.administrator.seven.R; -import com.example.administrator.seven.dialog.LoadingDialog; -import com.example.administrator.seven.widget.TitleBar; +import com.fenghoo.seven.R; +import com.fenghoo.seven.dialog.LoadingDialog; +import com.fenghoo.seven.widget.TitleBar; import com.hannesdorfmann.mosby3.mvp.MvpFragment; import com.hannesdorfmann.mosby3.mvp.MvpPresenter; import com.hannesdorfmann.mosby3.mvp.MvpView; diff --git a/app/src/main/java/com/example/administrator/seven/common/Constants.java b/app/src/main/java/com/fenghoo/seven/common/Constants.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/common/Constants.java rename to app/src/main/java/com/fenghoo/seven/common/Constants.java index b235710..047a581 100644 --- a/app/src/main/java/com/example/administrator/seven/common/Constants.java +++ b/app/src/main/java/com/fenghoo/seven/common/Constants.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.common; +package com.fenghoo.seven.common; /** * Created by Administrator on 2016/1/10. diff --git a/app/src/main/java/com/fenghoo/seven/db/DbBean.java b/app/src/main/java/com/fenghoo/seven/db/DbBean.java new file mode 100644 index 0000000..dbdd2e5 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/db/DbBean.java @@ -0,0 +1,4 @@ +package com.fenghoo.seven.db; + +public class DbBean { +} diff --git a/app/src/main/java/com/example/administrator/seven/db/DbRecordBeanData.java b/app/src/main/java/com/fenghoo/seven/db/DbRecordBeanData.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/db/DbRecordBeanData.java rename to app/src/main/java/com/fenghoo/seven/db/DbRecordBeanData.java index 4a3a2e0..b8d05b6 100644 --- a/app/src/main/java/com/example/administrator/seven/db/DbRecordBeanData.java +++ b/app/src/main/java/com/fenghoo/seven/db/DbRecordBeanData.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.db; +package com.fenghoo.seven.db; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/app/src/main/java/com/example/administrator/seven/db/dao/DataBaseHelper.java b/app/src/main/java/com/fenghoo/seven/db/dao/DataBaseHelper.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/db/dao/DataBaseHelper.java rename to app/src/main/java/com/fenghoo/seven/db/dao/DataBaseHelper.java index ab3a8dd..6f390cf 100644 --- a/app/src/main/java/com/example/administrator/seven/db/dao/DataBaseHelper.java +++ b/app/src/main/java/com/fenghoo/seven/db/dao/DataBaseHelper.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven.db.dao; +package com.fenghoo.seven.db.dao; import android.content.Context; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; -import com.example.administrator.seven.db.DbRecordBeanData; +import com.fenghoo.seven.db.DbRecordBeanData; import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; import com.j256.ormlite.dao.Dao; import com.j256.ormlite.support.ConnectionSource; diff --git a/app/src/main/java/com/example/administrator/seven/db/dao/DbRecordDao.java b/app/src/main/java/com/fenghoo/seven/db/dao/DbRecordDao.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/db/dao/DbRecordDao.java rename to app/src/main/java/com/fenghoo/seven/db/dao/DbRecordDao.java index b9cbdef..bb688ad 100644 --- a/app/src/main/java/com/example/administrator/seven/db/dao/DbRecordDao.java +++ b/app/src/main/java/com/fenghoo/seven/db/dao/DbRecordDao.java @@ -1,9 +1,9 @@ -package com.example.administrator.seven.db.dao; +package com.fenghoo.seven.db.dao; import android.content.Context; import android.database.SQLException; -import com.example.administrator.seven.db.DbRecordBeanData; +import com.fenghoo.seven.db.DbRecordBeanData; import com.j256.ormlite.dao.Dao; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/administrator/seven/dialog/BaseDialog.java b/app/src/main/java/com/fenghoo/seven/dialog/BaseDialog.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/dialog/BaseDialog.java rename to app/src/main/java/com/fenghoo/seven/dialog/BaseDialog.java index f790424..e599a97 100644 --- a/app/src/main/java/com/example/administrator/seven/dialog/BaseDialog.java +++ b/app/src/main/java/com/fenghoo/seven/dialog/BaseDialog.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.dialog; +package com.fenghoo.seven.dialog; import android.app.Activity; import android.app.Dialog; diff --git a/app/src/main/java/com/example/administrator/seven/dialog/BaseTipsDialog.java b/app/src/main/java/com/fenghoo/seven/dialog/BaseTipsDialog.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/dialog/BaseTipsDialog.java rename to app/src/main/java/com/fenghoo/seven/dialog/BaseTipsDialog.java index f5a0b96..b6282ce 100644 --- a/app/src/main/java/com/example/administrator/seven/dialog/BaseTipsDialog.java +++ b/app/src/main/java/com/fenghoo/seven/dialog/BaseTipsDialog.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.dialog; +package com.fenghoo.seven.dialog; import android.app.Dialog; import android.content.Context; @@ -10,7 +10,7 @@ import android.view.Window; import android.view.WindowManager; import android.widget.TextView; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; /** * Time: 2020/7/14 diff --git a/app/src/main/java/com/example/administrator/seven/dialog/LoadingDialog.java b/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialog.java similarity index 91% rename from app/src/main/java/com/example/administrator/seven/dialog/LoadingDialog.java rename to app/src/main/java/com/fenghoo/seven/dialog/LoadingDialog.java index 82ec72d..7c62710 100644 --- a/app/src/main/java/com/example/administrator/seven/dialog/LoadingDialog.java +++ b/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialog.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven.dialog; +package com.fenghoo.seven.dialog; import android.app.Activity; import android.content.Context; import android.view.View; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; /** * Created by: xudiwei diff --git a/app/src/main/java/com/example/administrator/seven/dialog/LoadingDialogy.java b/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialogy.java similarity index 94% rename from app/src/main/java/com/example/administrator/seven/dialog/LoadingDialogy.java rename to app/src/main/java/com/fenghoo/seven/dialog/LoadingDialogy.java index 15aa34f..e88f1cc 100644 --- a/app/src/main/java/com/example/administrator/seven/dialog/LoadingDialogy.java +++ b/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialogy.java @@ -1,11 +1,11 @@ -package com.example.administrator.seven.dialog; +package com.fenghoo.seven.dialog; import android.app.Dialog; import android.content.Context; import android.widget.ProgressBar; import android.widget.TextView; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; /** * on: 2018/11/2 diff --git a/app/src/main/java/com/example/administrator/seven/dialog/MyDialog.java b/app/src/main/java/com/fenghoo/seven/dialog/MyDialog.java similarity index 87% rename from app/src/main/java/com/example/administrator/seven/dialog/MyDialog.java rename to app/src/main/java/com/fenghoo/seven/dialog/MyDialog.java index 72b118c..857f684 100644 --- a/app/src/main/java/com/example/administrator/seven/dialog/MyDialog.java +++ b/app/src/main/java/com/fenghoo/seven/dialog/MyDialog.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.dialog; +package com.fenghoo.seven.dialog; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/example/administrator/seven/dialog/PersonnelDialogHelptwo.java b/app/src/main/java/com/fenghoo/seven/dialog/PersonnelDialogHelptwo.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/dialog/PersonnelDialogHelptwo.java rename to app/src/main/java/com/fenghoo/seven/dialog/PersonnelDialogHelptwo.java index 173e214..976b133 100644 --- a/app/src/main/java/com/example/administrator/seven/dialog/PersonnelDialogHelptwo.java +++ b/app/src/main/java/com/fenghoo/seven/dialog/PersonnelDialogHelptwo.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.dialog; +package com.fenghoo.seven.dialog; import android.app.Dialog; import android.content.Context; @@ -10,7 +10,7 @@ import android.view.Window; import android.view.WindowManager; import android.widget.TextView; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; /** * Time: 2020/5/12 diff --git a/app/src/main/java/com/example/administrator/seven/main/Fragment/MoFragment.java b/app/src/main/java/com/fenghoo/seven/main/Fragment/MoFragment.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/main/Fragment/MoFragment.java rename to app/src/main/java/com/fenghoo/seven/main/Fragment/MoFragment.java index e32f17f..d0f7e90 100644 --- a/app/src/main/java/com/example/administrator/seven/main/Fragment/MoFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/Fragment/MoFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.Fragment; +package com.fenghoo.seven.main.Fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -12,9 +12,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseFragment; -import com.example.administrator.seven.main.entity.Savaselect; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseFragment; +import com.fenghoo.seven.main.entity.Savaselect; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/Fragment/XikeInfoFragment.java b/app/src/main/java/com/fenghoo/seven/main/Fragment/XikeInfoFragment.java similarity index 93% rename from app/src/main/java/com/example/administrator/seven/main/Fragment/XikeInfoFragment.java rename to app/src/main/java/com/fenghoo/seven/main/Fragment/XikeInfoFragment.java index 8f34e98..c9fc5dc 100644 --- a/app/src/main/java/com/example/administrator/seven/main/Fragment/XikeInfoFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/Fragment/XikeInfoFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.Fragment; +package com.fenghoo.seven.main.Fragment; import android.annotation.SuppressLint; import android.util.Log; @@ -6,12 +6,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.example.administrator.seven.JsonUtils; -import com.example.administrator.seven.R; -import com.example.administrator.seven.main.adapter.mine.XikeInfoAdapter; -import com.example.administrator.seven.main.entity.XikeInfoBean; -import com.example.administrator.seven.okgonet.NetApi; -import com.example.administrator.seven.okgonet.Observer; +import com.fenghoo.seven.JsonUtils; +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.adapter.mine.XikeInfoAdapter; +import com.fenghoo.seven.main.entity.XikeInfoBean; +import com.fenghoo.seven.okgonet.NetApi; +import com.fenghoo.seven.okgonet.Observer; import com.lzy.okgo.model.Response; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/contract/MyContract.java b/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/contract/MyContract.java similarity index 81% rename from app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/contract/MyContract.java rename to app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/contract/MyContract.java index a4ec876..a16e90c 100644 --- a/app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/contract/MyContract.java +++ b/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/contract/MyContract.java @@ -1,8 +1,8 @@ -package com.example.administrator.seven.main.Fragment.mvp.contract; +package com.fenghoo.seven.main.Fragment.mvp.contract; -import com.example.administrator.seven.base.BaseTreeView; -import com.example.administrator.seven.main.entity.mine.TreeUserEntity; -import com.example.administrator.seven.network.ApiCallBack; +import com.fenghoo.seven.base.BaseTreeView; +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +import com.fenghoo.seven.network.ApiCallBack; import com.tencent.mm.opensdk.openapi.IWXAPI; /** diff --git a/app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/model/MyModelImpl.java b/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/model/MyModelImpl.java similarity index 86% rename from app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/model/MyModelImpl.java rename to app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/model/MyModelImpl.java index c61f4dc..b7deba3 100644 --- a/app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/model/MyModelImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/model/MyModelImpl.java @@ -1,12 +1,12 @@ -package com.example.administrator.seven.main.Fragment.mvp.model; +package com.fenghoo.seven.main.Fragment.mvp.model; -import com.example.administrator.seven.main.Fragment.mvp.contract.MyContract; -import com.example.administrator.seven.main.entity.mine.TreeUserEntity; -import com.example.administrator.seven.network.ApiCallBack; -import com.example.administrator.seven.network.http.ApiUtils; -import com.example.administrator.seven.network.http.ResponseBean; -import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils; -import com.example.administrator.seven.wxapi.WXEntryActivity; +import com.fenghoo.seven.main.Fragment.mvp.contract.MyContract; +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +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 com.fenghoo.seven.wxapi.WXEntryActivity; import io.reactivex.Observable; import io.reactivex.ObservableEmitter; diff --git a/app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java similarity index 85% rename from app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java rename to app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java index 5598dd9..9320815 100644 --- a/app/src/main/java/com/example/administrator/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven.main.Fragment.mvp.presenter; +package com.fenghoo.seven.main.Fragment.mvp.presenter; -import com.example.administrator.seven.main.Fragment.mvp.contract.MyContract; -import com.example.administrator.seven.main.Fragment.mvp.model.MyModelImpl; -import com.example.administrator.seven.main.entity.mine.TreeUserEntity; -import com.example.administrator.seven.network.ApiCallBack; -import com.example.administrator.seven.wxapi.WXEntryActivity; +import com.fenghoo.seven.main.Fragment.mvp.contract.MyContract; +import com.fenghoo.seven.main.Fragment.mvp.model.MyModelImpl; +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +import com.fenghoo.seven.network.ApiCallBack; +import com.fenghoo.seven.wxapi.WXEntryActivity; import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; import com.tencent.mm.opensdk.modelmsg.SendAuth; import com.tencent.mm.opensdk.openapi.IWXAPI; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/LoginActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/LoginActivity.java similarity index 91% rename from app/src/main/java/com/example/administrator/seven/main/activity/LoginActivity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/LoginActivity.java index 85760f9..b576257 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/LoginActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/LoginActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.activity; +package com.fenghoo.seven.main.activity; import android.os.Bundle; import android.os.CountDownTimer; @@ -9,10 +9,10 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseTreeActivity; -import com.example.administrator.seven.main.activity.mvp.contract.LoginContract; -import com.example.administrator.seven.main.activity.mvp.presenterImpl.LoginPresenterImpl; +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; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/LoginPasswordActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java similarity index 87% rename from app/src/main/java/com/example/administrator/seven/main/activity/LoginPasswordActivity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java index dc51b28..9fb34dc 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/LoginPasswordActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.activity; +package com.fenghoo.seven.main.activity; import android.os.CountDownTimer; import android.text.Html; @@ -7,10 +7,10 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseTreeActivity; -import com.example.administrator.seven.main.activity.mvp.contract.LoginPasswordContract; -import com.example.administrator.seven.main.activity.mvp.presenterImpl.LoginPasswordPresenterImpl; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseTreeActivity; +import com.fenghoo.seven.main.activity.mvp.contract.LoginPasswordContract; +import com.fenghoo.seven.main.activity.mvp.presenterImpl.LoginPasswordPresenterImpl; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/Main2Activity.java b/app/src/main/java/com/fenghoo/seven/main/activity/Main2Activity.java similarity index 61% rename from app/src/main/java/com/example/administrator/seven/main/activity/Main2Activity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/Main2Activity.java index aacd759..4aacb03 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/Main2Activity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/Main2Activity.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven.main.activity; +package com.fenghoo.seven.main.activity; import android.os.Bundle; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.main.Fragment.XikeInfoFragment; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.main.Fragment.XikeInfoFragment; public class Main2Activity extends BaseActivity { diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/MainActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/main/activity/MainActivity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java index e64b3a8..0621f01 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/MainActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java @@ -1,17 +1,17 @@ -package com.example.administrator.seven.main.activity; +package com.fenghoo.seven.main.activity; import android.os.Bundle; import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.main.find.FindFragment; -import com.example.administrator.seven.main.kehu.TraceFragment; -import com.example.administrator.seven.main.my.MyFragment; -import com.example.administrator.seven.main.task.HomeFragment; -import com.example.administrator.seven.main.zhibo.LivebroFragment; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.main.find.FindFragment; +import com.fenghoo.seven.main.kehu.TraceFragment; +import com.fenghoo.seven.main.my.MyFragment; +import com.fenghoo.seven.main.task.HomeFragment; +import com.fenghoo.seven.main.zhibo.LivebroFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/SplashActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java similarity index 87% rename from app/src/main/java/com/example/administrator/seven/main/activity/SplashActivity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java index 7a41353..fe0d472 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/SplashActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.activity; +package com.fenghoo.seven.main.activity; import android.os.Bundle; import android.os.Handler; @@ -6,8 +6,8 @@ import android.os.Message; import android.view.KeyEvent; import android.view.WindowManager; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mine/InboundHistoryActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/mine/InboundHistoryActivity.java similarity index 88% rename from app/src/main/java/com/example/administrator/seven/main/activity/mine/InboundHistoryActivity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mine/InboundHistoryActivity.java index fe6bb1a..fab9ad7 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mine/InboundHistoryActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mine/InboundHistoryActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.activity.mine; +package com.fenghoo.seven.main.activity.mine; import android.os.Bundle; import android.view.View; @@ -6,11 +6,11 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.main.adapter.mine.InboundHistoryAdapter; -import com.example.administrator.seven.main.entity.mine.InboundHistoryResBean; -import com.example.administrator.seven.utils.SpaceItemDecoration; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.main.adapter.mine.InboundHistoryAdapter; +import com.fenghoo.seven.main.entity.mine.InboundHistoryResBean; +import com.fenghoo.seven.utils.SpaceItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mine/MessageNoticeActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/mine/MessageNoticeActivity.java similarity index 92% rename from app/src/main/java/com/example/administrator/seven/main/activity/mine/MessageNoticeActivity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mine/MessageNoticeActivity.java index 7a2fb48..6a93562 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mine/MessageNoticeActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mine/MessageNoticeActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.activity.mine; +package com.fenghoo.seven.main.activity.mine; import android.os.Bundle; import android.view.View; @@ -6,11 +6,11 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.main.adapter.mine.MessageNoticeAdapter; -import com.example.administrator.seven.main.entity.mine.MessageNoticeResBean; -import com.example.administrator.seven.utils.SpaceItemDecoration; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.main.adapter.mine.MessageNoticeAdapter; +import com.fenghoo.seven.main.entity.mine.MessageNoticeResBean; +import com.fenghoo.seven.utils.SpaceItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mine/OutboundHistoryActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/mine/OutboundHistoryActivity.java similarity index 88% rename from app/src/main/java/com/example/administrator/seven/main/activity/mine/OutboundHistoryActivity.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mine/OutboundHistoryActivity.java index 865162d..7ba882f 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mine/OutboundHistoryActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mine/OutboundHistoryActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.activity.mine; +package com.fenghoo.seven.main.activity.mine; import android.os.Bundle; import android.view.View; @@ -6,11 +6,11 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.main.adapter.mine.OutboundHistoryAdapter; -import com.example.administrator.seven.main.entity.mine.OutboundHistoryResBean; -import com.example.administrator.seven.utils.SpaceItemDecoration; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.main.adapter.mine.OutboundHistoryAdapter; +import com.fenghoo.seven.main.entity.mine.OutboundHistoryResBean; +import com.fenghoo.seven.utils.SpaceItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/contract/LoginContract.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginContract.java similarity index 89% rename from app/src/main/java/com/example/administrator/seven/main/activity/mvp/contract/LoginContract.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginContract.java index 6baa51d..b3c60ff 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/contract/LoginContract.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginContract.java @@ -1,9 +1,9 @@ -package com.example.administrator.seven.main.activity.mvp.contract; +package com.fenghoo.seven.main.activity.mvp.contract; -import com.example.administrator.seven.base.BaseTreeView; -import com.example.administrator.seven.main.entity.LoginBean; -import com.example.administrator.seven.network.ApiCallBack; +import com.fenghoo.seven.base.BaseTreeView; +import com.fenghoo.seven.main.entity.LoginBean; +import com.fenghoo.seven.network.ApiCallBack; /** * LoginContract diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/contract/LoginPasswordContract.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginPasswordContract.java similarity index 89% rename from app/src/main/java/com/example/administrator/seven/main/activity/mvp/contract/LoginPasswordContract.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginPasswordContract.java index c2e1297..23abe53 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/contract/LoginPasswordContract.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginPasswordContract.java @@ -1,9 +1,9 @@ -package com.example.administrator.seven.main.activity.mvp.contract; +package com.fenghoo.seven.main.activity.mvp.contract; -import com.example.administrator.seven.base.BaseTreeView; -import com.example.administrator.seven.main.entity.LoginBean; -import com.example.administrator.seven.network.ApiCallBack; +import com.fenghoo.seven.base.BaseTreeView; +import com.fenghoo.seven.main.entity.LoginBean; +import com.fenghoo.seven.network.ApiCallBack; /** * LoginContract diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/model/LoginModelImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginModelImpl.java similarity index 81% rename from app/src/main/java/com/example/administrator/seven/main/activity/mvp/model/LoginModelImpl.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginModelImpl.java index bc35fb0..209af35 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/model/LoginModelImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginModelImpl.java @@ -1,12 +1,12 @@ -package com.example.administrator.seven.main.activity.mvp.model; +package com.fenghoo.seven.main.activity.mvp.model; -import com.example.administrator.seven.main.activity.mvp.contract.LoginContract; -import com.example.administrator.seven.main.entity.LoginBean; -import com.example.administrator.seven.network.ApiCallBack; -import com.example.administrator.seven.network.http.ApiUtils; -import com.example.administrator.seven.network.http.ResponseBean; -import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.fenghoo.seven.main.activity.mvp.contract.LoginContract; +import com.fenghoo.seven.main.entity.LoginBean; +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; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/model/LoginPasswordModelImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginPasswordModelImpl.java similarity index 77% rename from app/src/main/java/com/example/administrator/seven/main/activity/mvp/model/LoginPasswordModelImpl.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginPasswordModelImpl.java index 356982f..b38679e 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/model/LoginPasswordModelImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/model/LoginPasswordModelImpl.java @@ -1,12 +1,12 @@ -package com.example.administrator.seven.main.activity.mvp.model; +package com.fenghoo.seven.main.activity.mvp.model; -import com.example.administrator.seven.main.activity.mvp.contract.LoginPasswordContract; -import com.example.administrator.seven.main.entity.LoginBean; -import com.example.administrator.seven.network.ApiCallBack; -import com.example.administrator.seven.network.http.ApiUtils; -import com.example.administrator.seven.network.http.ResponseBean; -import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.fenghoo.seven.main.activity.mvp.contract.LoginPasswordContract; +import com.fenghoo.seven.main.entity.LoginBean; +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; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java similarity index 84% rename from app/src/main/java/com/example/administrator/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java index 9d40028..1307556 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java @@ -1,13 +1,13 @@ -package com.example.administrator.seven.main.activity.mvp.presenterImpl; +package com.fenghoo.seven.main.activity.mvp.presenterImpl; import android.text.TextUtils; import android.util.Log; -import com.example.administrator.seven.main.activity.MainActivity; -import com.example.administrator.seven.main.activity.mvp.contract.LoginPasswordContract; -import com.example.administrator.seven.main.activity.mvp.model.LoginPasswordModelImpl; -import com.example.administrator.seven.main.entity.LoginBean; -import com.example.administrator.seven.network.ApiCallBack; +import com.fenghoo.seven.main.activity.MainActivity; +import com.fenghoo.seven.main.activity.mvp.contract.LoginPasswordContract; +import com.fenghoo.seven.main.activity.mvp.model.LoginPasswordModelImpl; +import com.fenghoo.seven.main.entity.LoginBean; +import com.fenghoo.seven.network.ApiCallBack; import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; import com.hannesdorfmann.mosby3.mvp.MvpPresenter; diff --git a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java similarity index 93% rename from app/src/main/java/com/example/administrator/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java rename to app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java index de853c1..584ac5f 100644 --- a/app/src/main/java/com/example/administrator/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPresenterImpl.java @@ -1,13 +1,13 @@ -package com.example.administrator.seven.main.activity.mvp.presenterImpl; +package com.fenghoo.seven.main.activity.mvp.presenterImpl; import android.text.TextUtils; import android.util.Log; -import com.example.administrator.seven.main.activity.MainActivity; -import com.example.administrator.seven.main.activity.mvp.contract.LoginContract; -import com.example.administrator.seven.main.activity.mvp.model.LoginModelImpl; -import com.example.administrator.seven.main.entity.LoginBean; -import com.example.administrator.seven.network.ApiCallBack; +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.entity.LoginBean; +import com.fenghoo.seven.network.ApiCallBack; import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/example/administrator/seven/main/adapter/GuideViewPagerAdapter.java b/app/src/main/java/com/fenghoo/seven/main/adapter/GuideViewPagerAdapter.java similarity index 94% rename from app/src/main/java/com/example/administrator/seven/main/adapter/GuideViewPagerAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/adapter/GuideViewPagerAdapter.java index c4d136a..c83dc7e 100644 --- a/app/src/main/java/com/example/administrator/seven/main/adapter/GuideViewPagerAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/adapter/GuideViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.adapter; +package com.fenghoo.seven.main.adapter; import android.content.Context; import android.view.View; diff --git a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/InboundHistoryAdapter.java b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/InboundHistoryAdapter.java similarity index 71% rename from app/src/main/java/com/example/administrator/seven/main/adapter/mine/InboundHistoryAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/adapter/mine/InboundHistoryAdapter.java index baedf05..d31b8cd 100644 --- a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/InboundHistoryAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/InboundHistoryAdapter.java @@ -1,12 +1,12 @@ -package com.example.administrator.seven.main.adapter.mine; +package com.fenghoo.seven.main.adapter.mine; import android.content.Context; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.example.administrator.seven.R; -import com.example.administrator.seven.main.entity.mine.InboundHistoryResBean; -import com.example.administrator.seven.main.entity.mine.MessageNoticeResBean; +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.entity.mine.InboundHistoryResBean; +import com.fenghoo.seven.main.entity.mine.MessageNoticeResBean; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/MessageNoticeAdapter.java b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/MessageNoticeAdapter.java similarity index 77% rename from app/src/main/java/com/example/administrator/seven/main/adapter/mine/MessageNoticeAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/adapter/mine/MessageNoticeAdapter.java index b6ad513..94316c5 100644 --- a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/MessageNoticeAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/MessageNoticeAdapter.java @@ -1,11 +1,11 @@ -package com.example.administrator.seven.main.adapter.mine; +package com.fenghoo.seven.main.adapter.mine; import android.content.Context; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.example.administrator.seven.R; -import com.example.administrator.seven.main.entity.mine.MessageNoticeResBean; +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.entity.mine.MessageNoticeResBean; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/OutboundHistoryAdapter.java b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/OutboundHistoryAdapter.java similarity index 77% rename from app/src/main/java/com/example/administrator/seven/main/adapter/mine/OutboundHistoryAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/adapter/mine/OutboundHistoryAdapter.java index 39f2cd2..27462af 100644 --- a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/OutboundHistoryAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/OutboundHistoryAdapter.java @@ -1,11 +1,11 @@ -package com.example.administrator.seven.main.adapter.mine; +package com.fenghoo.seven.main.adapter.mine; import android.content.Context; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.example.administrator.seven.R; -import com.example.administrator.seven.main.entity.mine.OutboundHistoryResBean; +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.entity.mine.OutboundHistoryResBean; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/XikeInfoAdapter.java b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/XikeInfoAdapter.java similarity index 80% rename from app/src/main/java/com/example/administrator/seven/main/adapter/mine/XikeInfoAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/adapter/mine/XikeInfoAdapter.java index 7b700c9..3ae34b9 100644 --- a/app/src/main/java/com/example/administrator/seven/main/adapter/mine/XikeInfoAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/adapter/mine/XikeInfoAdapter.java @@ -1,13 +1,13 @@ -package com.example.administrator.seven.main.adapter.mine; +package com.fenghoo.seven.main.adapter.mine; import android.content.Context; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.example.administrator.seven.R; -import com.example.administrator.seven.main.entity.XikeInfoBean; -import com.example.administrator.seven.utils.WidgetTools; +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.entity.XikeInfoBean; +import com.fenghoo.seven.utils.WidgetTools; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/LoginBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/LoginBean.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/main/entity/LoginBean.java rename to app/src/main/java/com/fenghoo/seven/main/entity/LoginBean.java index 6cfa755..e766c94 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/LoginBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/LoginBean.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.entity; +package com.fenghoo.seven.main.entity; import java.io.Serializable; diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/Savaselect.java b/app/src/main/java/com/fenghoo/seven/main/entity/Savaselect.java similarity index 88% rename from app/src/main/java/com/example/administrator/seven/main/entity/Savaselect.java rename to app/src/main/java/com/fenghoo/seven/main/entity/Savaselect.java index 4f3ce63..600295a 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/Savaselect.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/Savaselect.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.entity; +package com.fenghoo.seven.main.entity; public class Savaselect { private String serchuid=""; diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/SendSmsBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/SendSmsBean.java similarity index 94% rename from app/src/main/java/com/example/administrator/seven/main/entity/SendSmsBean.java rename to app/src/main/java/com/fenghoo/seven/main/entity/SendSmsBean.java index 67f945c..7c052c8 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/SendSmsBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/SendSmsBean.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.entity; +package com.fenghoo.seven.main.entity; public class SendSmsBean { diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/UserInfoModel.java b/app/src/main/java/com/fenghoo/seven/main/entity/UserInfoModel.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/main/entity/UserInfoModel.java rename to app/src/main/java/com/fenghoo/seven/main/entity/UserInfoModel.java index c814d1a..3b29365 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/UserInfoModel.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/UserInfoModel.java @@ -1,6 +1,6 @@ -package com.example.administrator.seven.main.entity; +package com.fenghoo.seven.main.entity; -import com.example.administrator.seven.base.BaseBean; +import com.fenghoo.seven.base.BaseBean; /** * 项目名：NewJiaJieSong diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/XikeInfoBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/XikeInfoBean.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/main/entity/XikeInfoBean.java rename to app/src/main/java/com/fenghoo/seven/main/entity/XikeInfoBean.java index 038912c..9e884e5 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/XikeInfoBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/XikeInfoBean.java @@ -1,6 +1,6 @@ -package com.example.administrator.seven.main.entity; +package com.fenghoo.seven.main.entity; -import com.example.administrator.seven.test.BaseModel; +import com.fenghoo.seven.test.BaseModel; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/InboundHistoryResBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/InboundHistoryResBean.java new file mode 100644 index 0000000..bca5eb8 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/entity/mine/InboundHistoryResBean.java @@ -0,0 +1,4 @@ +package com.fenghoo.seven.main.entity.mine; + +public class InboundHistoryResBean { +} diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/MessageNoticeResBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/MessageNoticeResBean.java new file mode 100644 index 0000000..8eeaf79 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/entity/mine/MessageNoticeResBean.java @@ -0,0 +1,7 @@ +package com.fenghoo.seven.main.entity.mine; + + +public class MessageNoticeResBean { + + +} diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/OutboundHistoryResBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/OutboundHistoryResBean.java new file mode 100644 index 0000000..cfa54e7 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/entity/mine/OutboundHistoryResBean.java @@ -0,0 +1,4 @@ +package com.fenghoo.seven.main.entity.mine; + +public class OutboundHistoryResBean { +} diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/mine/TreeUserEntity.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/TreeUserEntity.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/main/entity/mine/TreeUserEntity.java rename to app/src/main/java/com/fenghoo/seven/main/entity/mine/TreeUserEntity.java index a0cb61c..093db59 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/mine/TreeUserEntity.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/mine/TreeUserEntity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.entity.mine; +package com.fenghoo.seven.main.entity.mine; import java.io.Serializable; diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/mine/UserHeadEntity.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/UserHeadEntity.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/main/entity/mine/UserHeadEntity.java rename to app/src/main/java/com/fenghoo/seven/main/entity/mine/UserHeadEntity.java index e942879..fc90c5b 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/mine/UserHeadEntity.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/mine/UserHeadEntity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.entity.mine; +package com.fenghoo.seven.main.entity.mine; /** * UserHeadEntity diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/mine/WeChatLoginEntity.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginEntity.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/main/entity/mine/WeChatLoginEntity.java rename to app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginEntity.java index beab935..5687315 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/mine/WeChatLoginEntity.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginEntity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.entity.mine; +package com.fenghoo.seven.main.entity.mine; /** * WeChatLoginEntity diff --git a/app/src/main/java/com/example/administrator/seven/main/entity/mine/WeChatLoginResultEntity.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginResultEntity.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/main/entity/mine/WeChatLoginResultEntity.java rename to app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginResultEntity.java index 11a7842..04a64aa 100644 --- a/app/src/main/java/com/example/administrator/seven/main/entity/mine/WeChatLoginResultEntity.java +++ b/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginResultEntity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.entity.mine; +package com.fenghoo.seven.main.entity.mine; /** * WeChatLoginResultEntity diff --git a/app/src/main/java/com/example/administrator/seven/main/find/CloundSolutionActivity.java b/app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/main/find/CloundSolutionActivity.java rename to app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java index e927e41..8f72261 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/CloundSolutionActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; import android.os.Bundle; import android.os.Handler; @@ -12,8 +12,8 @@ import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationListener; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; import com.zaaach.citypicker.CityPicker; import com.zaaach.citypicker.adapter.OnPickListener; import com.zaaach.citypicker.model.City; diff --git a/app/src/main/java/com/example/administrator/seven/main/find/CommentActivity.java b/app/src/main/java/com/fenghoo/seven/main/find/CommentActivity.java similarity index 68% rename from app/src/main/java/com/example/administrator/seven/main/find/CommentActivity.java rename to app/src/main/java/com/fenghoo/seven/main/find/CommentActivity.java index 2e44956..b2ee9e5 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/CommentActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/CommentActivity.java @@ -1,11 +1,11 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; import android.os.Bundle; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.main.find.ui.CommentFragment; -import com.example.administrator.seven.widget.TitleBar; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.main.find.ui.CommentFragment; +import com.fenghoo.seven.widget.TitleBar; /** * 评论 diff --git a/app/src/main/java/com/example/administrator/seven/main/find/ConversationActivity.java b/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java similarity index 68% rename from app/src/main/java/com/example/administrator/seven/main/find/ConversationActivity.java rename to app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java index ddf2408..df7dbb3 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/ConversationActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java @@ -1,11 +1,10 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; import android.os.Bundle; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.main.find.ui.CommentFragment; -import com.example.administrator.seven.widget.TitleBar; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.widget.TitleBar; /** * 会话 diff --git a/app/src/main/java/com/example/administrator/seven/main/find/FindFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java similarity index 86% rename from app/src/main/java/com/example/administrator/seven/main/find/FindFragment.java rename to app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java index 8802f6a..a4a0879 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/FindFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java @@ -1,26 +1,19 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; import android.content.Context; import android.os.Bundle; -import android.os.Handler; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; -import com.example.administrator.seven.R; -import com.example.administrator.seven.main.find.ui.FindFragmenttwo; -import com.example.administrator.seven.main.kehu.activity.ShowAty; -import com.example.administrator.seven.test.BaseFragment; -import com.zaaach.citypicker.CityPicker; -import com.zaaach.citypicker.adapter.OnPickListener; -import com.zaaach.citypicker.model.City; +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.find.ui.FindFragmenttwo; +import com.fenghoo.seven.main.kehu.activity.ShowAty; +import com.fenghoo.seven.test.BaseFragment; import com.zaaach.citypicker.model.HotCity; -import com.zaaach.citypicker.model.LocateState; -import com.zaaach.citypicker.model.LocatedCity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/main/find/MainActivitytwot.java b/app/src/main/java/com/fenghoo/seven/main/find/MainActivitytwot.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/main/find/MainActivitytwot.java rename to app/src/main/java/com/fenghoo/seven/main/find/MainActivitytwot.java index 4fc4104..999dd24 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/MainActivitytwot.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/MainActivitytwot.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; import android.os.Bundle; import android.os.Handler; @@ -9,7 +9,7 @@ import android.widget.CompoundButton; import android.widget.TextView; import android.widget.Toast; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import com.zaaach.citypicker.CityPicker; import com.zaaach.citypicker.adapter.OnPickListener; import com.zaaach.citypicker.model.City; diff --git a/app/src/main/java/com/example/administrator/seven/main/find/OnSatisfactionListener.java b/app/src/main/java/com/fenghoo/seven/main/find/OnSatisfactionListener.java similarity index 67% rename from app/src/main/java/com/example/administrator/seven/main/find/OnSatisfactionListener.java rename to app/src/main/java/com/fenghoo/seven/main/find/OnSatisfactionListener.java index 1982e93..54353c8 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/OnSatisfactionListener.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/OnSatisfactionListener.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; /** * Created by ${hu} on 2017/5/27. diff --git a/app/src/main/java/com/example/administrator/seven/main/find/PriLetFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java similarity index 87% rename from app/src/main/java/com/example/administrator/seven/main/find/PriLetFragment.java rename to app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java index 2185ef9..16335a2 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/PriLetFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; import android.content.Context; import android.os.Bundle; @@ -7,9 +7,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; -import com.example.administrator.seven.R; -import com.example.administrator.seven.main.find.ui.PrivateletterFragment; -import com.example.administrator.seven.test.BaseFragment; +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.find.ui.PrivateletterFragment; +import com.fenghoo.seven.test.BaseFragment; /** * 私信 diff --git a/app/src/main/java/com/example/administrator/seven/main/find/QuestionsFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java similarity index 85% rename from app/src/main/java/com/example/administrator/seven/main/find/QuestionsFragment.java rename to app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java index dda62d3..ccf68fd 100644 --- a/app/src/main/java/com/example/administrator/seven/main/find/QuestionsFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.find; +package com.fenghoo.seven.main.find; import android.text.Editable; @@ -8,13 +8,13 @@ import android.view.View; import android.view.WindowManager; import android.widget.Button; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseTreeFragment; -import com.example.administrator.seven.main.find.adapter.QuestionsAdapter; -import com.example.administrator.seven.main.find.entity.QuestionsEntity; -import com.example.administrator.seven.main.find.mvp.contract.QuestionsContract; -import com.example.administrator.seven.main.find.mvp.presenter.QuestionsPresenterImpl; -import com.example.administrator.seven.widget.PastEditText; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseTreeFragment; +import com.fenghoo.seven.main.find.adapter.QuestionsAdapter; +import com.fenghoo.seven.main.find.entity.QuestionsEntity; +import com.fenghoo.seven.main.find.mvp.contract.QuestionsContract; +import com.fenghoo.seven.main.find.mvp.presenter.QuestionsPresenterImpl; +import com.fenghoo.seven.widget.PastEditText; import java.util.ArrayList; import java.util.List; @@ -39,6 +39,11 @@ public class QuestionsFragment extends BaseTreeFragment implements View.OnClickListener, PersonalProfileContract.View { + + private ProfileSpUtils mProfileSpUtils; + private TextView tv_banding; + private IWXAPI mApi; + private CircleImageView my_ima_head; + private TextView my_tv_name; + private TextView my_tv_phone; + private TextView my_tv_address; + + @Override + protected int getLayoutId() { + return R.layout.activity_personal_profile; + } + + @Override + protected void initView() { + setTitleBar(R.id.title_bar, getString(R.string.text_PersonalProfile), true, false, null); + tv_banding = (TextView) findViewById(R.id.tv_banding); + my_ima_head = (CircleImageView) findViewById(R.id.my_ima_head); + my_tv_name = (TextView) findViewById(R.id.my_tv_name); + my_tv_phone = (TextView) findViewById(R.id.my_tv_phone); + my_tv_address = (TextView) findViewById(R.id.my_tv_address); + if (mProfileSpUtils == null) { + mProfileSpUtils = ProfileSpUtils.getInstance(); + } + + } + + @Override + protected void initData() { + mApi = WXAPIFactory.createWXAPI(mContext, WXEntryActivity.WEIXIN_APP_ID, true); + //如果用户没有登录,结束资料详情页 + if (!mProfileSpUtils.isLogin()) { + finish(); + return; + } + getPresenter().funSet(); + + } + + @Override + protected void initEvent() { + tv_banding.setOnClickListener(this); + } + + @Override + public PersonalProfilePresenterImpl createPresenter() { + return new PersonalProfilePresenterImpl(); + } + + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.tv_banding: + //绑定微信 + getPresenter().weChatBind(); + break; + default: + break; + } + } + + @Override + protected void onResume() { + super.onResume(); + + } + + @Override + public IWXAPI getWxApi() { + return mApi; + } + + @Override + public void refreshData() { + + } + + @Override + public Context getContext() { + return PersonalProfileActivity.this; + } + + @Override + public void onRefresh(funSetBean.DataBean data) { + GlideTools.init(mContext).displaypic(my_ima_head, data.getUser_head(), R.mipmap.icon_default_head); + WidgetTools.setTextfive(my_tv_name, "", data.getUser_name()); + WidgetTools.setTextfive(my_tv_phone, "", data.getPhone_number()); + WidgetTools.setTextfive(my_tv_address, "", data.getUser_area()); + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/UserHeadEntity.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/UserHeadEntity.java new file mode 100644 index 0000000..8e6fa00 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/UserHeadEntity.java @@ -0,0 +1,68 @@ +package com.fenghoo.seven.main.my.entity; + +/** + * UserHeadEntity + * (๑• . •๑) + * 类描述: 修改头像成功后返回的实体类 + * Created by LeiXiaoXing on 2017/4/28 11:20 + */ + +public class UserHeadEntity { + + /** + * 图片原图路径 + * origin : /Uploads/app_user_head_img/origin/20170428/5902b4f7c2b69.png + * 主页使用的尺寸路径 + * Home_Page_Size : /Uploads/app_user_head_img/Home_Page_Size/20170428/5902b4f7c2b69.png + * 个人信息使用尺寸路径 + * info_page_size : /Uploads/app_user_head_img/info_page_size/20170428/5902b4f7c2b69.png + * 通讯录头像使用尺寸路径 + * user_list_size : /Uploads/app_user_head_img/user_list_size/20170428/5902b4f7c2b69.png + */ + + private String origin; + private String Home_Page_Size; + private String info_page_size; + private String user_list_size; + private String classThumb;//班级头像 + + public String getOrigin() { + return origin; + } + + public void setOrigin(String origin) { + this.origin = origin; + } + + public String getHome_Page_Size() { + return Home_Page_Size; + } + + public void setHome_Page_Size(String Home_Page_Size) { + this.Home_Page_Size = Home_Page_Size; + } + + public String getInfo_page_size() { + return info_page_size; + } + + public void setInfo_page_size(String info_page_size) { + this.info_page_size = info_page_size; + } + + public String getUser_list_size() { + return user_list_size; + } + + public void setUser_list_size(String user_list_size) { + this.user_list_size = user_list_size; + } + + public String getClassThumb() { + return classThumb; + } + + public void setClassThumb(String classThumb) { + this.classThumb = classThumb; + } +} 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 new file mode 100644 index 0000000..c96fae4 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/funSetBean.java @@ -0,0 +1,111 @@ +package com.fenghoo.seven.main.my.entity; + +import com.fenghoo.seven.test.BaseModel; + +/** + * Time: 2020/8/25 + * Author: jianbo + * Description: + */ +public class funSetBean extends BaseModel { + + /** + * msg : 成功 + * data : {"user_head":"","address_addr":"","user_area":"","user_name":"admin","union_id":"","phone_number":"14729066305"} + * success : 0 + */ + + private String msg; + private DataBean data; + private int success; + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public int getSuccess() { + return success; + } + + public void setSuccess(int success) { + this.success = success; + } + + public static class DataBean { + /** + * user_head : + * address_addr : + * user_area : + * user_name : admin + * union_id : + * phone_number : 14729066305 + */ + + private String user_head; + private String address_addr; + private String user_area; + private String user_name; + private String union_id; + private String phone_number; + + public String getUser_head() { + return user_head; + } + + public void setUser_head(String user_head) { + this.user_head = user_head; + } + + public String getAddress_addr() { + return address_addr; + } + + public void setAddress_addr(String address_addr) { + this.address_addr = address_addr; + } + + public String getUser_area() { + return user_area; + } + + public void setUser_area(String user_area) { + this.user_area = user_area; + } + + public String getUser_name() { + return user_name; + } + + public void setUser_name(String user_name) { + this.user_name = user_name; + } + + public String getUnion_id() { + return union_id; + } + + public void setUnion_id(String union_id) { + this.union_id = union_id; + } + + public String getPhone_number() { + return phone_number; + } + + public void setPhone_number(String phone_number) { + this.phone_number = phone_number; + } + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/my/mvp/contract/PersonalProfileContract.java b/app/src/main/java/com/fenghoo/seven/main/my/mvp/contract/PersonalProfileContract.java new file mode 100644 index 0000000..2511fb1 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/mvp/contract/PersonalProfileContract.java @@ -0,0 +1,93 @@ +package com.fenghoo.seven.main.my.mvp.contract; + +import android.app.Activity; +import android.content.Context; + +import com.fenghoo.seven.base.BaseTreeView; +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +import com.fenghoo.seven.main.kehu.Bean.CommitDesignModel; +import com.fenghoo.seven.main.my.entity.funSetBean; +import com.fenghoo.seven.network.ApiCallBack; +import com.tencent.mm.opensdk.openapi.IWXAPI; + +/** + * PersonalProfileContract + * (๑• . •๑) + * 类描述: + * Created by LeiXiaoXing on 2017/4/26 14:31 + */ + +public class PersonalProfileContract { + + public interface View extends BaseTreeView { + /** + * 获取微信APi + * + * @return 微信APi + */ + IWXAPI getWxApi(); + + /** + * 刷新资料数据 + */ + void refreshData(); + + Context getContext(); + + /** + * 刷新界面 + */ + void onRefresh(funSetBean.DataBean data); + + + } + + public interface Presenter { + + /** + * 微信绑定 + */ + void weChatBind(); + + /** + * 功能设置 + */ + void funSet(); + + } + + public interface Model { + + /** + * 是否绑定微信 + * + * @return + */ + boolean isBindWeChat(); + + /** + * 微信绑定 + */ + void weChatBind(ApiCallBack callBack); + + /** + * 刷新用户数据 + */ + void refresh(ApiCallBack callBack); + + /** + * 保存用户资料 + * + * @param entity 用户资料 + */ + void save(TreeUserEntity entity); + + /** + * 功能设置 + */ + void funSet(String uid, final ApiCallBack callBack); + + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/my/mvp/model/EditProfileModelImpl.java b/app/src/main/java/com/fenghoo/seven/main/my/mvp/model/EditProfileModelImpl.java new file mode 100644 index 0000000..2dffdca --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/mvp/model/EditProfileModelImpl.java @@ -0,0 +1,70 @@ +package com.fenghoo.seven.main.my.mvp.model; + +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +import com.fenghoo.seven.main.my.entity.funSetBean; +import com.fenghoo.seven.main.my.mvp.contract.PersonalProfileContract; +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 com.fenghoo.seven.wxapi.WXEntryActivity; + +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.annotations.NonNull; +import io.reactivex.functions.Consumer; +import io.reactivex.schedulers.Schedulers; + + +public class EditProfileModelImpl implements PersonalProfileContract.Model{ + + @Override + public boolean isBindWeChat() { + return false; + } + + @Override + public void weChatBind(final ApiCallBack callBack) { + WXEntryActivity.getObservable() + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(@NonNull ResponseBean treeUserEntityResponseBean) throws Exception { + callBack.onResponse(treeUserEntityResponseBean); + } + }, new Consumer() { + @Override + public void accept(@NonNull Throwable throwable) throws Exception { + callBack.onFailure(throwable); + } + }); + } + + @Override + public void refresh(ApiCallBack callBack) { + + } + + @Override + public void save(TreeUserEntity entity) { + + } + + @Override + public void funSet(String uid, final ApiCallBack callBack) { + ApiUtils.getApi() + .funSet(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()) + .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); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/my/mvp/presenter/PersonalProfilePresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/my/mvp/presenter/PersonalProfilePresenterImpl.java new file mode 100644 index 0000000..3c4d306 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/mvp/presenter/PersonalProfilePresenterImpl.java @@ -0,0 +1,95 @@ +package com.fenghoo.seven.main.my.mvp.presenter; + +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +import com.fenghoo.seven.main.kehu.Bean.CommitDesignModel; +import com.fenghoo.seven.main.my.entity.funSetBean; +import com.fenghoo.seven.main.my.mvp.contract.PersonalProfileContract; +import com.fenghoo.seven.main.my.mvp.model.EditProfileModelImpl; +import com.fenghoo.seven.network.ApiCallBack; +import com.fenghoo.seven.utils.ToastUtils; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.fenghoo.seven.wxapi.WXEntryActivity; +import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; +import com.tencent.mm.opensdk.modelmsg.SendAuth; +import com.tencent.mm.opensdk.openapi.IWXAPI; + +/** + * Created by Administrator on 2017/04/26 + */ + +public class PersonalProfilePresenterImpl extends MvpBasePresenter implements PersonalProfileContract.Presenter { + + private EditProfileModelImpl mModel; + + public PersonalProfilePresenterImpl() { + mModel = new EditProfileModelImpl(); + } + + @Override + public void weChatBind() { + if (getView() == null) { + return; + } + + boolean is_bind_wechat = mModel.isBindWeChat(); + + if (is_bind_wechat) { + getView().toast("已绑定微信账号"); + return; + } + + IWXAPI wxApi = getView().getWxApi(); + wxApi.registerApp(WXEntryActivity.WEIXIN_APP_ID); + + if (wxApi != null && wxApi.isWXAppInstalled()) { + SendAuth.Req req = new SendAuth.Req(); + req.scope = "snsapi_userinfo"; + req.state = "wechat_sdk_demo_test_neng"; + getView().showProgressDialog(""); + wxApi.sendReq(req); + } else { + getView().toast("未安装微信"); + } + + mModel.weChatBind(new ApiCallBack() { + @Override + protected void onSuccess(TreeUserEntity responseData, String message) { + if (getView() == null) { + return; + } + getView().dismissProgressDialog(); + getView().refreshData(); + } + + @Override + protected void onFailure(String error) { + if (getView() == null) { + return; + } + getView().dismissProgressDialog(); + getView().toast(error); + } + }); + } + + @Override + public void funSet() { + + mModel.funSet(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(), new ApiCallBack() { + @Override + protected void onSuccess(funSetBean responseData, String message) { + if (responseData.getSuccess() == 0) { + ToastUtils.showToast(getView().getContext(), responseData.getMsg()); + funSetBean.DataBean data = responseData.getData(); + getView().onRefresh(data); + } + } + + @Override + protected void onFailure(String error) { + ToastUtils.showToast(getView().getContext(), "数据异常"); + } + }); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/administrator/seven/main/task/HomeFragment.java b/app/src/main/java/com/fenghoo/seven/main/task/HomeFragment.java similarity index 86% rename from app/src/main/java/com/example/administrator/seven/main/task/HomeFragment.java rename to app/src/main/java/com/fenghoo/seven/main/task/HomeFragment.java index 56a37e9..a2dc107 100644 --- a/app/src/main/java/com/example/administrator/seven/main/task/HomeFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/task/HomeFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.task; +package com.fenghoo.seven.main.task; import android.os.Bundle; import android.view.LayoutInflater; @@ -6,8 +6,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseFragment; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseFragment; public class HomeFragment extends BaseFragment { diff --git a/app/src/main/java/com/example/administrator/seven/main/zhibo/LivebroFragment.java b/app/src/main/java/com/fenghoo/seven/main/zhibo/LivebroFragment.java similarity index 86% rename from app/src/main/java/com/example/administrator/seven/main/zhibo/LivebroFragment.java rename to app/src/main/java/com/fenghoo/seven/main/zhibo/LivebroFragment.java index 2a96626..9dffd10 100644 --- a/app/src/main/java/com/example/administrator/seven/main/zhibo/LivebroFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/zhibo/LivebroFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.main.zhibo; +package com.fenghoo.seven.main.zhibo; import android.os.Bundle; import android.view.LayoutInflater; @@ -6,8 +6,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseFragment; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseFragment; /** * 直播 diff --git a/app/src/main/java/com/example/administrator/seven/network/ApiCallBack.java b/app/src/main/java/com/fenghoo/seven/network/ApiCallBack.java similarity index 92% rename from app/src/main/java/com/example/administrator/seven/network/ApiCallBack.java rename to app/src/main/java/com/fenghoo/seven/network/ApiCallBack.java index 849de6d..e5e889a 100644 --- a/app/src/main/java/com/example/administrator/seven/network/ApiCallBack.java +++ b/app/src/main/java/com/fenghoo/seven/network/ApiCallBack.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven.network; +package com.fenghoo.seven.network; -import com.example.administrator.seven.network.http.ResponseBean; -import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.fenghoo.seven.network.http.ResponseBean; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import java.net.ConnectException; import java.net.SocketTimeoutException; diff --git a/app/src/main/java/com/example/administrator/seven/network/ApiUtils.java b/app/src/main/java/com/fenghoo/seven/network/ApiUtils.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/network/ApiUtils.java rename to app/src/main/java/com/fenghoo/seven/network/ApiUtils.java index 2a6b4a1..b01316e 100644 --- a/app/src/main/java/com/example/administrator/seven/network/ApiUtils.java +++ b/app/src/main/java/com/fenghoo/seven/network/ApiUtils.java @@ -1,7 +1,7 @@ -package com.example.administrator.seven.network; +package com.fenghoo.seven.network; -import com.example.administrator.seven.network.http.MyApi; +import com.fenghoo.seven.network.http.MyApi; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/example/administrator/seven/network/LifeTreeAPIException.java b/app/src/main/java/com/fenghoo/seven/network/LifeTreeAPIException.java similarity index 86% rename from app/src/main/java/com/example/administrator/seven/network/LifeTreeAPIException.java rename to app/src/main/java/com/fenghoo/seven/network/LifeTreeAPIException.java index ad6018e..cadc145 100644 --- a/app/src/main/java/com/example/administrator/seven/network/LifeTreeAPIException.java +++ b/app/src/main/java/com/fenghoo/seven/network/LifeTreeAPIException.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.network; +package com.fenghoo.seven.network; /** * Created by: xudiwei diff --git a/app/src/main/java/com/example/administrator/seven/network/LifeTreeConverterFactory.java b/app/src/main/java/com/fenghoo/seven/network/LifeTreeConverterFactory.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/network/LifeTreeConverterFactory.java rename to app/src/main/java/com/fenghoo/seven/network/LifeTreeConverterFactory.java index 132fd89..7bcfb8b 100644 --- a/app/src/main/java/com/example/administrator/seven/network/LifeTreeConverterFactory.java +++ b/app/src/main/java/com/fenghoo/seven/network/LifeTreeConverterFactory.java @@ -1,8 +1,8 @@ -package com.example.administrator.seven.network; +package com.fenghoo.seven.network; -import com.example.administrator.seven.BaseApplication; -import com.example.administrator.seven.R; +import com.fenghoo.seven.BaseApplication; +import com.fenghoo.seven.R; import com.google.gson.Gson; import org.json.JSONException; diff --git a/app/src/main/java/com/example/administrator/seven/network/WeChatApi.java b/app/src/main/java/com/fenghoo/seven/network/WeChatApi.java similarity index 79% rename from app/src/main/java/com/example/administrator/seven/network/WeChatApi.java rename to app/src/main/java/com/fenghoo/seven/network/WeChatApi.java index a4ccc07..6faad22 100644 --- a/app/src/main/java/com/example/administrator/seven/network/WeChatApi.java +++ b/app/src/main/java/com/fenghoo/seven/network/WeChatApi.java @@ -1,7 +1,7 @@ -package com.example.administrator.seven.network; +package com.fenghoo.seven.network; -import com.example.administrator.seven.main.entity.mine.WeChatLoginEntity; -import com.example.administrator.seven.main.entity.mine.WeChatLoginResultEntity; +import com.fenghoo.seven.main.entity.mine.WeChatLoginEntity; +import com.fenghoo.seven.main.entity.mine.WeChatLoginResultEntity; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/example/administrator/seven/network/http/ApiUtils.java b/app/src/main/java/com/fenghoo/seven/network/http/ApiUtils.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/network/http/ApiUtils.java rename to app/src/main/java/com/fenghoo/seven/network/http/ApiUtils.java index 38566b0..dfb78f0 100644 --- a/app/src/main/java/com/example/administrator/seven/network/http/ApiUtils.java +++ b/app/src/main/java/com/fenghoo/seven/network/http/ApiUtils.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.network.http; +package com.fenghoo.seven.network.http; diff --git a/app/src/main/java/com/example/administrator/seven/network/http/LifeTreeAPIException.java b/app/src/main/java/com/fenghoo/seven/network/http/LifeTreeAPIException.java similarity index 85% rename from app/src/main/java/com/example/administrator/seven/network/http/LifeTreeAPIException.java rename to app/src/main/java/com/fenghoo/seven/network/http/LifeTreeAPIException.java index 0e62281..aca0b51 100644 --- a/app/src/main/java/com/example/administrator/seven/network/http/LifeTreeAPIException.java +++ b/app/src/main/java/com/fenghoo/seven/network/http/LifeTreeAPIException.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.network.http; +package com.fenghoo.seven.network.http; /** * Created by: xudiwei diff --git a/app/src/main/java/com/example/administrator/seven/network/http/LifeTreeConverterFactory.java b/app/src/main/java/com/fenghoo/seven/network/http/LifeTreeConverterFactory.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/network/http/LifeTreeConverterFactory.java rename to app/src/main/java/com/fenghoo/seven/network/http/LifeTreeConverterFactory.java index ca5fe60..f5717eb 100644 --- a/app/src/main/java/com/example/administrator/seven/network/http/LifeTreeConverterFactory.java +++ b/app/src/main/java/com/fenghoo/seven/network/http/LifeTreeConverterFactory.java @@ -1,8 +1,8 @@ -package com.example.administrator.seven.network.http; +package com.fenghoo.seven.network.http; -import com.example.administrator.seven.BaseApplication; -import com.example.administrator.seven.R; +import com.fenghoo.seven.BaseApplication; +import com.fenghoo.seven.R; import com.google.gson.Gson; import org.json.JSONException; diff --git a/app/src/main/java/com/example/administrator/seven/network/http/MyApi.java b/app/src/main/java/com/fenghoo/seven/network/http/MyApi.java similarity index 87% rename from app/src/main/java/com/example/administrator/seven/network/http/MyApi.java rename to app/src/main/java/com/fenghoo/seven/network/http/MyApi.java index 9eb6641..272f7fd 100644 --- a/app/src/main/java/com/example/administrator/seven/network/http/MyApi.java +++ b/app/src/main/java/com/fenghoo/seven/network/http/MyApi.java @@ -1,18 +1,17 @@ -package com.example.administrator.seven.network.http; +package com.fenghoo.seven.network.http; -import com.example.administrator.seven.main.entity.LoginBean; -import com.example.administrator.seven.main.entity.mine.TreeUserEntity; -import com.example.administrator.seven.main.find.entity.QuestionsEntity; -import com.example.administrator.seven.main.kehu.Bean.CommitDesignModel; -import com.example.administrator.seven.main.kehu.Bean.industryBean; +import com.fenghoo.seven.main.entity.LoginBean; +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +import com.fenghoo.seven.main.find.entity.QuestionsEntity; +import com.fenghoo.seven.main.kehu.Bean.CommitDesignModel; +import com.fenghoo.seven.main.my.entity.funSetBean; import java.util.List; import io.reactivex.Observable; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; -import retrofit2.http.GET; import retrofit2.http.POST; /** @@ -25,7 +24,7 @@ import retrofit2.http.POST; public class MyApi { - public static String URiBase = "http://192.168.1.4/device/";// 7月7 + public static String URiBase = "http://192.168.1.3/device/";// 7月7 /** * 网络接口前缀 @@ -148,6 +147,17 @@ public class MyApi { Observable>> ask(@Field("user_id") String user_id , @Field("qu_key") String qu_key); + + /** + * 功能设置 + * + */ + @POST("AppLogin/funSet") + @FormUrlEncoded + Observable> funSet(@Field("uid") String uid + ); + + } } diff --git a/app/src/main/java/com/example/administrator/seven/network/http/ResponseBean.java b/app/src/main/java/com/fenghoo/seven/network/http/ResponseBean.java similarity index 91% rename from app/src/main/java/com/example/administrator/seven/network/http/ResponseBean.java rename to app/src/main/java/com/fenghoo/seven/network/http/ResponseBean.java index 45ebf58..8e8d711 100644 --- a/app/src/main/java/com/example/administrator/seven/network/http/ResponseBean.java +++ b/app/src/main/java/com/fenghoo/seven/network/http/ResponseBean.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.network.http; +package com.fenghoo.seven.network.http; /** * ResponseBean diff --git a/app/src/main/java/com/example/administrator/seven/okgonet/Func1.java b/app/src/main/java/com/fenghoo/seven/okgonet/Func1.java similarity index 88% rename from app/src/main/java/com/example/administrator/seven/okgonet/Func1.java rename to app/src/main/java/com/fenghoo/seven/okgonet/Func1.java index 105ffd3..bce981d 100644 --- a/app/src/main/java/com/example/administrator/seven/okgonet/Func1.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/Func1.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.okgonet; +package com.fenghoo.seven.okgonet; /** * ================================================ diff --git a/app/src/main/java/com/example/administrator/seven/okgonet/HttpConstants.java b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/okgonet/HttpConstants.java rename to app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java index 7e5ceb1..42aba2c 100644 --- a/app/src/main/java/com/example/administrator/seven/okgonet/HttpConstants.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.okgonet; +package com.fenghoo.seven.okgonet; /** * 项目名：JiaJieSong @@ -13,7 +13,7 @@ public class HttpConstants { // public static String URiBase = "http://www.fenghoo.com.cn";// 蜂狐商户版线上 - public static String URiBase = "http://192.168.1.4";// 7月7 + public static String URiBase = "http://192.168.1.3";// 7月7 /** diff --git a/app/src/main/java/com/example/administrator/seven/okgonet/NetApi.java b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/okgonet/NetApi.java rename to app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java index 5d3d4d4..eadae11 100644 --- a/app/src/main/java/com/example/administrator/seven/okgonet/NetApi.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.okgonet; +package com.fenghoo.seven.okgonet; import com.lzy.okgo.OkGo; diff --git a/app/src/main/java/com/example/administrator/seven/okgonet/Observable.java b/app/src/main/java/com/fenghoo/seven/okgonet/Observable.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/okgonet/Observable.java rename to app/src/main/java/com/fenghoo/seven/okgonet/Observable.java index ffa3862..a139fc2 100644 --- a/app/src/main/java/com/example/administrator/seven/okgonet/Observable.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/Observable.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.okgonet; +package com.fenghoo.seven.okgonet; //定义一个动作 diff --git a/app/src/main/java/com/example/administrator/seven/okgonet/Observer.java b/app/src/main/java/com/fenghoo/seven/okgonet/Observer.java similarity index 63% rename from app/src/main/java/com/example/administrator/seven/okgonet/Observer.java rename to app/src/main/java/com/fenghoo/seven/okgonet/Observer.java index 3c87d5f..8c5a661 100644 --- a/app/src/main/java/com/example/administrator/seven/okgonet/Observer.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/Observer.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.okgonet; +package com.fenghoo.seven.okgonet; public interface Observer { void onNext(T t); diff --git a/app/src/main/java/com/example/administrator/seven/test/BaseFragment.java b/app/src/main/java/com/fenghoo/seven/test/BaseFragment.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/test/BaseFragment.java rename to app/src/main/java/com/fenghoo/seven/test/BaseFragment.java index b1a23ab..ec4d6e6 100644 --- a/app/src/main/java/com/example/administrator/seven/test/BaseFragment.java +++ b/app/src/main/java/com/fenghoo/seven/test/BaseFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import android.app.Activity; @@ -10,7 +10,7 @@ import android.util.Log; import android.util.TypedValue; import android.widget.Toast; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import androidx.annotation.IdRes; import androidx.annotation.StringRes; diff --git a/app/src/main/java/com/example/administrator/seven/test/BaseModel.java b/app/src/main/java/com/fenghoo/seven/test/BaseModel.java similarity index 82% rename from app/src/main/java/com/example/administrator/seven/test/BaseModel.java rename to app/src/main/java/com/fenghoo/seven/test/BaseModel.java index 54147cb..921f02c 100644 --- a/app/src/main/java/com/example/administrator/seven/test/BaseModel.java +++ b/app/src/main/java/com/fenghoo/seven/test/BaseModel.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import java.io.Serializable; diff --git a/app/src/main/java/com/example/administrator/seven/test/BaseMvpFragment.java b/app/src/main/java/com/fenghoo/seven/test/BaseMvpFragment.java similarity index 94% rename from app/src/main/java/com/example/administrator/seven/test/BaseMvpFragment.java rename to app/src/main/java/com/fenghoo/seven/test/BaseMvpFragment.java index c398a1f..70e7107 100644 --- a/app/src/main/java/com/example/administrator/seven/test/BaseMvpFragment.java +++ b/app/src/main/java/com/fenghoo/seven/test/BaseMvpFragment.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import android.util.Log; diff --git a/app/src/main/java/com/example/administrator/seven/test/BasePresenter.java b/app/src/main/java/com/fenghoo/seven/test/BasePresenter.java similarity index 94% rename from app/src/main/java/com/example/administrator/seven/test/BasePresenter.java rename to app/src/main/java/com/fenghoo/seven/test/BasePresenter.java index c50b39a..0ac4c05 100644 --- a/app/src/main/java/com/example/administrator/seven/test/BasePresenter.java +++ b/app/src/main/java/com/fenghoo/seven/test/BasePresenter.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/example/administrator/seven/test/BaseRecyclerViewAdapter.java b/app/src/main/java/com/fenghoo/seven/test/BaseRecyclerViewAdapter.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/test/BaseRecyclerViewAdapter.java rename to app/src/main/java/com/fenghoo/seven/test/BaseRecyclerViewAdapter.java index f7f14da..cfe6df1 100644 --- a/app/src/main/java/com/example/administrator/seven/test/BaseRecyclerViewAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/test/BaseRecyclerViewAdapter.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import android.content.Context; import android.view.LayoutInflater; @@ -6,7 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/test/CommunityMessageBean.java b/app/src/main/java/com/fenghoo/seven/test/CommunityMessageBean.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/test/CommunityMessageBean.java rename to app/src/main/java/com/fenghoo/seven/test/CommunityMessageBean.java index 90e87c0..e883484 100644 --- a/app/src/main/java/com/example/administrator/seven/test/CommunityMessageBean.java +++ b/app/src/main/java/com/fenghoo/seven/test/CommunityMessageBean.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/test/IInviteMessagePresenter.java b/app/src/main/java/com/fenghoo/seven/test/IInviteMessagePresenter.java similarity index 90% rename from app/src/main/java/com/example/administrator/seven/test/IInviteMessagePresenter.java rename to app/src/main/java/com/fenghoo/seven/test/IInviteMessagePresenter.java index 8f1c29f..1f266bf 100644 --- a/app/src/main/java/com/example/administrator/seven/test/IInviteMessagePresenter.java +++ b/app/src/main/java/com/fenghoo/seven/test/IInviteMessagePresenter.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; diff --git a/app/src/main/java/com/example/administrator/seven/test/IInviteMessageView.java b/app/src/main/java/com/fenghoo/seven/test/IInviteMessageView.java similarity index 90% rename from app/src/main/java/com/example/administrator/seven/test/IInviteMessageView.java rename to app/src/main/java/com/fenghoo/seven/test/IInviteMessageView.java index 316de11..f8b9477 100644 --- a/app/src/main/java/com/example/administrator/seven/test/IInviteMessageView.java +++ b/app/src/main/java/com/fenghoo/seven/test/IInviteMessageView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; /** * Created by: xudiwei diff --git a/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java b/app/src/main/java/com/fenghoo/seven/test/InviteMessageAdapter.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java rename to app/src/main/java/com/fenghoo/seven/test/InviteMessageAdapter.java index 3fe8b3e..61b70bf 100644 --- a/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/test/InviteMessageAdapter.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import android.content.Context; import android.util.Log; @@ -7,7 +7,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/test/RLListPager.java b/app/src/main/java/com/fenghoo/seven/test/RLListPager.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/test/RLListPager.java rename to app/src/main/java/com/fenghoo/seven/test/RLListPager.java index 22145d6..8910e8d 100644 --- a/app/src/main/java/com/example/administrator/seven/test/RLListPager.java +++ b/app/src/main/java/com/fenghoo/seven/test/RLListPager.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import android.content.Context; import android.util.AttributeSet; @@ -6,7 +6,7 @@ import android.util.TypedValue; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/example/administrator/seven/test/getstore.java b/app/src/main/java/com/fenghoo/seven/test/getstore.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/test/getstore.java rename to app/src/main/java/com/fenghoo/seven/test/getstore.java index f6c28e7..8f45352 100644 --- a/app/src/main/java/com/example/administrator/seven/test/getstore.java +++ b/app/src/main/java/com/fenghoo/seven/test/getstore.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.test; +package com.fenghoo.seven.test; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/utils/AbStrUtil.java b/app/src/main/java/com/fenghoo/seven/utils/AbStrUtil.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/AbStrUtil.java rename to app/src/main/java/com/fenghoo/seven/utils/AbStrUtil.java index 281fff0..ac993c5 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/AbStrUtil.java +++ b/app/src/main/java/com/fenghoo/seven/utils/AbStrUtil.java @@ -1,7 +1,7 @@ /* * */ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/com/example/administrator/seven/utils/BaseAdapter.java b/app/src/main/java/com/fenghoo/seven/utils/BaseAdapter.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/utils/BaseAdapter.java rename to app/src/main/java/com/fenghoo/seven/utils/BaseAdapter.java index 9a16904..51dd848 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/BaseAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/utils/BaseAdapter.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/example/administrator/seven/utils/DensityUtil.java b/app/src/main/java/com/fenghoo/seven/utils/DensityUtil.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/utils/DensityUtil.java rename to app/src/main/java/com/fenghoo/seven/utils/DensityUtil.java index ecdf4d0..17bb3a8 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/DensityUtil.java +++ b/app/src/main/java/com/fenghoo/seven/utils/DensityUtil.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.util.TypedValue; diff --git a/app/src/main/java/com/example/administrator/seven/utils/GlideTools.java b/app/src/main/java/com/fenghoo/seven/utils/GlideTools.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/GlideTools.java rename to app/src/main/java/com/fenghoo/seven/utils/GlideTools.java index 066138d..3a33fd8 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/GlideTools.java +++ b/app/src/main/java/com/fenghoo/seven/utils/GlideTools.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/example/administrator/seven/utils/LocatData.java b/app/src/main/java/com/fenghoo/seven/utils/LocatData.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/utils/LocatData.java rename to app/src/main/java/com/fenghoo/seven/utils/LocatData.java index b1bb342..2522af2 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/LocatData.java +++ b/app/src/main/java/com/fenghoo/seven/utils/LocatData.java @@ -1,6 +1,6 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; -import com.example.administrator.seven.BaseApplication; +import com.fenghoo.seven.BaseApplication; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/administrator/seven/utils/NetUtils.java b/app/src/main/java/com/fenghoo/seven/utils/NetUtils.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/NetUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/NetUtils.java index b9a25e0..b261e7d 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/NetUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/NetUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.app.Activity; import android.content.ComponentName; diff --git a/app/src/main/java/com/example/administrator/seven/utils/SPUtils.java b/app/src/main/java/com/fenghoo/seven/utils/SPUtils.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/utils/SPUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/SPUtils.java index 8e287fa..7794602 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/SPUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/SPUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/example/administrator/seven/utils/SharedTools.java b/app/src/main/java/com/fenghoo/seven/utils/SharedTools.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/SharedTools.java rename to app/src/main/java/com/fenghoo/seven/utils/SharedTools.java index 1c49949..4b1a89f 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/SharedTools.java +++ b/app/src/main/java/com/fenghoo/seven/utils/SharedTools.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java b/app/src/main/java/com/fenghoo/seven/utils/SpaceItemDecoration.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java rename to app/src/main/java/com/fenghoo/seven/utils/SpaceItemDecoration.java index c44d91e..70afe7e 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java +++ b/app/src/main/java/com/fenghoo/seven/utils/SpaceItemDecoration.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/app/src/main/java/com/example/administrator/seven/utils/StatusBarUtil.java b/app/src/main/java/com/fenghoo/seven/utils/StatusBarUtil.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/StatusBarUtil.java rename to app/src/main/java/com/fenghoo/seven/utils/StatusBarUtil.java index 29c0cc9..eeda78a 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/StatusBarUtil.java +++ b/app/src/main/java/com/fenghoo/seven/utils/StatusBarUtil.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.annotation.TargetApi; import android.app.Activity; diff --git a/app/src/main/java/com/example/administrator/seven/utils/StringUtils.java b/app/src/main/java/com/fenghoo/seven/utils/StringUtils.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/StringUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/StringUtils.java index 679336b..681fe97 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/StringUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/StringUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.app.Activity; import android.content.ClipboardManager; diff --git a/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java b/app/src/main/java/com/fenghoo/seven/utils/ToastUtils.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/ToastUtils.java index b7aaf8b..f2fe022 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/ToastUtils.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.view.Gravity; @@ -8,7 +8,7 @@ import android.view.WindowManager; import android.widget.TextView; import android.widget.Toast; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; /** diff --git a/app/src/main/java/com/example/administrator/seven/utils/ToolsText.java b/app/src/main/java/com/fenghoo/seven/utils/ToolsText.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/ToolsText.java rename to app/src/main/java/com/fenghoo/seven/utils/ToolsText.java index 326466c..54e5c72 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/ToolsText.java +++ b/app/src/main/java/com/fenghoo/seven/utils/ToolsText.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/app/src/main/java/com/example/administrator/seven/utils/ToolsUtils.java b/app/src/main/java/com/fenghoo/seven/utils/ToolsUtils.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/utils/ToolsUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/ToolsUtils.java index 630a17b..413633b 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/ToolsUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/ToolsUtils.java @@ -5,7 +5,7 @@ * Date: 2015-3-20 * Company: BlueMobi ********************************************/ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/example/administrator/seven/utils/UiUtils.java b/app/src/main/java/com/fenghoo/seven/utils/UiUtils.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/utils/UiUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/UiUtils.java index 12b99a4..e09b880 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/UiUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/UiUtils.java @@ -1,5 +1,5 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.util.DisplayMetrics; diff --git a/app/src/main/java/com/example/administrator/seven/utils/VerificationUtils.java b/app/src/main/java/com/fenghoo/seven/utils/VerificationUtils.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/utils/VerificationUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/VerificationUtils.java index 1a31a7d..438c0a8 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/VerificationUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/VerificationUtils.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/example/administrator/seven/utils/WebViewJavaScriptFunction.java b/app/src/main/java/com/fenghoo/seven/utils/WebViewJavaScriptFunction.java similarity index 64% rename from app/src/main/java/com/example/administrator/seven/utils/WebViewJavaScriptFunction.java rename to app/src/main/java/com/fenghoo/seven/utils/WebViewJavaScriptFunction.java index 2749d37..df1a18e 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/WebViewJavaScriptFunction.java +++ b/app/src/main/java/com/fenghoo/seven/utils/WebViewJavaScriptFunction.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; public interface WebViewJavaScriptFunction { diff --git a/app/src/main/java/com/example/administrator/seven/utils/WidgetTools.java b/app/src/main/java/com/fenghoo/seven/utils/WidgetTools.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/utils/WidgetTools.java rename to app/src/main/java/com/fenghoo/seven/utils/WidgetTools.java index c87f738..3f81c32 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/WidgetTools.java +++ b/app/src/main/java/com/fenghoo/seven/utils/WidgetTools.java @@ -5,7 +5,7 @@ * Date: 2015-3-20 * Company: BlueMobi ********************************************/ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/example/administrator/seven/utils/X5WebView.java b/app/src/main/java/com/fenghoo/seven/utils/X5WebView.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/utils/X5WebView.java rename to app/src/main/java/com/fenghoo/seven/utils/X5WebView.java index 5553614..6ab0a86 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/X5WebView.java +++ b/app/src/main/java/com/fenghoo/seven/utils/X5WebView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.utils; +package com.fenghoo.seven.utils; import android.annotation.SuppressLint; diff --git a/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java b/app/src/main/java/com/fenghoo/seven/utils/checkVersionsUtils/ProfileSpUtils.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java rename to app/src/main/java/com/fenghoo/seven/utils/checkVersionsUtils/ProfileSpUtils.java index 89221f4..cc60d58 100644 --- a/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java +++ b/app/src/main/java/com/fenghoo/seven/utils/checkVersionsUtils/ProfileSpUtils.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven.utils.checkVersionsUtils; +package com.fenghoo.seven.utils.checkVersionsUtils; import android.content.Context; import android.content.SharedPreferences; import android.text.TextUtils; -import com.example.administrator.seven.main.entity.LoginBean; +import com.fenghoo.seven.main.entity.LoginBean; import com.google.gson.Gson; /** diff --git a/app/src/main/java/com/example/administrator/seven/view/DynamicWave.java b/app/src/main/java/com/fenghoo/seven/view/DynamicWave.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/view/DynamicWave.java rename to app/src/main/java/com/fenghoo/seven/view/DynamicWave.java index ddfbcae..b883ab0 100644 --- a/app/src/main/java/com/example/administrator/seven/view/DynamicWave.java +++ b/app/src/main/java/com/fenghoo/seven/view/DynamicWave.java @@ -1,5 +1,5 @@ -package com.example.administrator.seven.view; +package com.fenghoo.seven.view; import android.content.Context; @@ -12,7 +12,7 @@ import android.graphics.PaintFlagsDrawFilter; import android.util.AttributeSet; import android.view.View; -import com.example.administrator.seven.utils.UiUtils; +import com.fenghoo.seven.utils.UiUtils; public class DynamicWave extends View { diff --git a/app/src/main/java/com/example/administrator/seven/view/HeadZoomScrollView.java b/app/src/main/java/com/fenghoo/seven/view/HeadZoomScrollView.java similarity index 99% rename from app/src/main/java/com/example/administrator/seven/view/HeadZoomScrollView.java rename to app/src/main/java/com/fenghoo/seven/view/HeadZoomScrollView.java index 8aa2454..e65aa81 100644 --- a/app/src/main/java/com/example/administrator/seven/view/HeadZoomScrollView.java +++ b/app/src/main/java/com/fenghoo/seven/view/HeadZoomScrollView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.view; +package com.fenghoo.seven.view; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; diff --git a/app/src/main/java/com/example/administrator/seven/view/MyScrollView.java b/app/src/main/java/com/fenghoo/seven/view/MyScrollView.java similarity index 95% rename from app/src/main/java/com/example/administrator/seven/view/MyScrollView.java rename to app/src/main/java/com/fenghoo/seven/view/MyScrollView.java index 7a79c0e..2d8c21d 100644 --- a/app/src/main/java/com/example/administrator/seven/view/MyScrollView.java +++ b/app/src/main/java/com/fenghoo/seven/view/MyScrollView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.view; +package com.fenghoo.seven.view; /** * Time: 2020/8/12 diff --git a/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java b/app/src/main/java/com/fenghoo/seven/view/StatusBarView.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/view/StatusBarView.java rename to app/src/main/java/com/fenghoo/seven/view/StatusBarView.java index 4432718..a8612b1 100644 --- a/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java +++ b/app/src/main/java/com/fenghoo/seven/view/StatusBarView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.view; +package com.fenghoo.seven.view; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/example/administrator/seven/view/webview/XfiveWebActivity.java b/app/src/main/java/com/fenghoo/seven/view/webview/XfiveWebActivity.java similarity index 89% rename from app/src/main/java/com/example/administrator/seven/view/webview/XfiveWebActivity.java rename to app/src/main/java/com/fenghoo/seven/view/webview/XfiveWebActivity.java index 8f44967..9b2f799 100644 --- a/app/src/main/java/com/example/administrator/seven/view/webview/XfiveWebActivity.java +++ b/app/src/main/java/com/fenghoo/seven/view/webview/XfiveWebActivity.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.view.webview; +package com.fenghoo.seven.view.webview; import android.content.Context; import android.content.Intent; @@ -7,10 +7,10 @@ import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; -import com.example.administrator.seven.R; -import com.example.administrator.seven.base.BaseActivity; -import com.example.administrator.seven.utils.WebViewJavaScriptFunction; -import com.example.administrator.seven.utils.X5WebView; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.utils.WebViewJavaScriptFunction; +import com.fenghoo.seven.utils.X5WebView; /** * x5webview封装 diff --git a/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java b/app/src/main/java/com/fenghoo/seven/widget/CircleImageView.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java rename to app/src/main/java/com/fenghoo/seven/widget/CircleImageView.java index f34c12e..c50158f 100644 --- a/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java +++ b/app/src/main/java/com/fenghoo/seven/widget/CircleImageView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.widget; +package com.fenghoo.seven.widget; import android.content.Context; @@ -18,7 +18,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.util.AttributeSet; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import androidx.annotation.ColorRes; import androidx.annotation.DrawableRes; diff --git a/app/src/main/java/com/example/administrator/seven/widget/ItemView.java b/app/src/main/java/com/fenghoo/seven/widget/ItemView.java similarity index 97% rename from app/src/main/java/com/example/administrator/seven/widget/ItemView.java rename to app/src/main/java/com/fenghoo/seven/widget/ItemView.java index 0f79ab8..d4da44f 100644 --- a/app/src/main/java/com/example/administrator/seven/widget/ItemView.java +++ b/app/src/main/java/com/fenghoo/seven/widget/ItemView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.widget; +package com.fenghoo.seven.widget; import android.content.Context; import android.content.res.TypedArray; @@ -9,7 +9,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/example/administrator/seven/widget/ListViewForScrollView.java b/app/src/main/java/com/fenghoo/seven/widget/ListViewForScrollView.java similarity index 94% rename from app/src/main/java/com/example/administrator/seven/widget/ListViewForScrollView.java rename to app/src/main/java/com/fenghoo/seven/widget/ListViewForScrollView.java index 93ffad5..071981a 100644 --- a/app/src/main/java/com/example/administrator/seven/widget/ListViewForScrollView.java +++ b/app/src/main/java/com/fenghoo/seven/widget/ListViewForScrollView.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.widget; +package com.fenghoo.seven.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/example/administrator/seven/widget/PastEditText.java b/app/src/main/java/com/fenghoo/seven/widget/PastEditText.java similarity index 96% rename from app/src/main/java/com/example/administrator/seven/widget/PastEditText.java rename to app/src/main/java/com/fenghoo/seven/widget/PastEditText.java index bcff9e2..5cdb833 100644 --- a/app/src/main/java/com/example/administrator/seven/widget/PastEditText.java +++ b/app/src/main/java/com/fenghoo/seven/widget/PastEditText.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.widget; +package com.fenghoo.seven.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/example/administrator/seven/widget/TagView.java b/app/src/main/java/com/fenghoo/seven/widget/TagView.java similarity index 93% rename from app/src/main/java/com/example/administrator/seven/widget/TagView.java rename to app/src/main/java/com/fenghoo/seven/widget/TagView.java index 4690a14..644b05e 100644 --- a/app/src/main/java/com/example/administrator/seven/widget/TagView.java +++ b/app/src/main/java/com/fenghoo/seven/widget/TagView.java @@ -1,10 +1,10 @@ -package com.example.administrator.seven.widget; +package com.fenghoo.seven.widget; import android.content.Context; import android.util.AttributeSet; import android.widget.ToggleButton; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; /** * 标签 diff --git a/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java b/app/src/main/java/com/fenghoo/seven/widget/TitleBar.java similarity index 98% rename from app/src/main/java/com/example/administrator/seven/widget/TitleBar.java rename to app/src/main/java/com/fenghoo/seven/widget/TitleBar.java index f02ca2a..d283be5 100644 --- a/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java +++ b/app/src/main/java/com/fenghoo/seven/widget/TitleBar.java @@ -1,4 +1,4 @@ -package com.example.administrator.seven.widget; +package com.fenghoo.seven.widget; import android.content.Context; import android.util.AttributeSet; @@ -8,7 +8,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.example.administrator.seven.R; +import com.fenghoo.seven.R; import androidx.annotation.ColorRes; import androidx.annotation.DrawableRes; diff --git a/app/src/main/java/com/example/administrator/seven/wxapi/WXEntryActivity.java b/app/src/main/java/com/fenghoo/seven/wxapi/WXEntryActivity.java similarity index 93% rename from app/src/main/java/com/example/administrator/seven/wxapi/WXEntryActivity.java rename to app/src/main/java/com/fenghoo/seven/wxapi/WXEntryActivity.java index ba59838..59bc564 100644 --- a/app/src/main/java/com/example/administrator/seven/wxapi/WXEntryActivity.java +++ b/app/src/main/java/com/fenghoo/seven/wxapi/WXEntryActivity.java @@ -6,19 +6,19 @@ * Copyright (c) 2013年 mob.com. All rights reserved. */ -package com.example.administrator.seven.wxapi; +package com.fenghoo.seven.wxapi; import android.content.Intent; import android.os.Bundle; import android.widget.Toast; -import com.example.administrator.seven.main.entity.mine.TreeUserEntity; -import com.example.administrator.seven.main.entity.mine.WeChatLoginEntity; -import com.example.administrator.seven.main.entity.mine.WeChatLoginResultEntity; -import com.example.administrator.seven.network.ApiUtils; -import com.example.administrator.seven.network.LifeTreeAPIException; -import com.example.administrator.seven.network.http.ResponseBean; -import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.fenghoo.seven.main.entity.mine.TreeUserEntity; +import com.fenghoo.seven.main.entity.mine.WeChatLoginEntity; +import com.fenghoo.seven.main.entity.mine.WeChatLoginResultEntity; +import com.fenghoo.seven.network.ApiUtils; +import com.fenghoo.seven.network.LifeTreeAPIException; +import com.fenghoo.seven.network.http.ResponseBean; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.tencent.mm.opensdk.modelbase.BaseReq; import com.tencent.mm.opensdk.modelbase.BaseResp; import com.tencent.mm.opensdk.modelmsg.SendAuth; diff --git a/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java b/app/src/main/java/com/fenghoo/seven/wxapi/WXPayEntryActivity.java similarity index 93% rename from app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java rename to app/src/main/java/com/fenghoo/seven/wxapi/WXPayEntryActivity.java index d526d53..f6f85f4 100644 --- a/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java +++ b/app/src/main/java/com/fenghoo/seven/wxapi/WXPayEntryActivity.java @@ -1,11 +1,11 @@ -package com.example.administrator.seven.wxapi; +package com.fenghoo.seven.wxapi; import android.content.Intent; import android.os.Bundle; import android.widget.TextView; -import com.example.administrator.seven.base.BaseActivity; +import com.fenghoo.seven.base.BaseActivity; import com.tencent.mm.opensdk.modelbase.BaseReq; import com.tencent.mm.opensdk.modelbase.BaseResp; import com.tencent.mm.opensdk.openapi.IWXAPI; diff --git a/app/src/main/res/drawable/shape_tv_bangding.xml b/app/src/main/res/drawable/shape_tv_bangding.xml new file mode 100644 index 0000000..b76dc5d --- /dev/null +++ b/app/src/main/res/drawable/shape_tv_bangding.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/ac_search.xml b/app/src/main/res/layout/ac_search.xml index 91d3865..873caa3 100644 --- a/app/src/main/res/layout/ac_search.xml +++ b/app/src/main/res/layout/ac_search.xml @@ -121,7 +121,7 @@ android:text="搜索历史" /> - - diff --git a/app/src/main/res/layout/activity_conversation.xml b/app/src/main/res/layout/activity_conversation.xml index c3875f7..4ccf6f5 100644 --- a/app/src/main/res/layout/activity_conversation.xml +++ b/app/src/main/res/layout/activity_conversation.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 838cb46..0423936 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -7,7 +7,7 @@ android:background="#ffffff" > - @@ -28,7 +28,7 @@ android:layout_marginRight="12dp" android:background="@drawable/bg_markingxinxi"> - - diff --git a/app/src/main/res/layout/activity_find_password.xml b/app/src/main/res/layout/activity_find_password.xml index de0f458..2e22899 100644 --- a/app/src/main/res/layout/activity_find_password.xml +++ b/app/src/main/res/layout/activity_find_password.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -25,7 +25,7 @@ android:text="@string/text_phone_number_" android:textSize="15sp"/> - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index 07f672d..980f976 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.example.administrator.newjiajiesong.main.activity.RegisterActivity"> + tools:context="com.fenghoo.administrator.newjiajiesong.main.activity.RegisterActivity"> - - - - - - + diff --git a/app/src/main/res/layout/allocation_item.xml b/app/src/main/res/layout/allocation_item.xml index db01679..e7cbe85 100644 --- a/app/src/main/res/layout/allocation_item.xml +++ b/app/src/main/res/layout/allocation_item.xml @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:layout_weight="1"> - - + diff --git a/app/src/main/res/layout/cuslist_item.xml b/app/src/main/res/layout/cuslist_item.xml index c685776..bd91e7a 100644 --- a/app/src/main/res/layout/cuslist_item.xml +++ b/app/src/main/res/layout/cuslist_item.xml @@ -40,7 +40,7 @@ - - - - - + - - --> - @@ -293,4 +293,4 @@ - + diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index a2b8b27..41d56ed 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/app/src/main/res/layout/fragment_my.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.example.administrator.seven.main.my.MyFragment"> + tools:context="com.fenghoo.seven.main.my.MyFragment"> + tools:context="com.fenghoo.seven.main.find.QuestionsFragment"> - - diff --git a/app/src/main/res/layout/item_question_right.xml b/app/src/main/res/layout/item_question_right.xml index f9eeaa2..e85def9 100644 --- a/app/src/main/res/layout/item_question_right.xml +++ b/app/src/main/res/layout/item_question_right.xml @@ -26,7 +26,7 @@ android:textSize="16sp" tools:text="我是一个什么的我是一个什么的我个什么么的我是一个什么的"/> - - - diff --git a/app/src/main/res/layout/private_let_item.xml b/app/src/main/res/layout/private_let_item.xml index c685776..bd91e7a 100644 --- a/app/src/main/res/layout/private_let_item.xml +++ b/app/src/main/res/layout/private_let_item.xml @@ -40,7 +40,7 @@ - + + 16dp + 16dp + 25dp + diff --git a/app/src/main/res/values-v19/styles.xml b/app/src/main/res/values-v19/styles.xml new file mode 100644 index 0000000..5097409 --- /dev/null +++ b/app/src/main/res/values-v19/styles.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 09afb3c..d855da8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -64,5 +64,7 @@ 当前版本 隐私政策 + 个人资料 + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6514c99..7fdc2e1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -25,6 +25,11 @@ + + - - - - - - - - -