diff --git a/app/build.gradle b/app/build.gradle index 2b2991a..e031e49 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { -// applicationId "com.idealclover.njuclassschedule" - applicationId "com.idealclover.wheretosleepinnju" + applicationId "com.lilystudio.wheretosleepinnju" minSdkVersion 21 - targetSdkVersion 27 - versionCode 3 - versionName "0.2.0" + targetSdkVersion 28 + versionCode 4 + versionName "0.2.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -35,13 +34,15 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' implementation 'org.jsoup:jsoup:1.10.3' implementation 'io.reactivex:rxjava:1.1.3' implementation 'io.reactivex:rxandroid:1.0.1' implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.zhy:okhttputils:2.6.2' + implementation 'com.tencent.bugly:crashreport_upgrade:latest.release' + implementation 'com.tencent.bugly:nativecrashreport:latest.release' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 92e8ad7..e7aa12a 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -61,4 +61,8 @@ -keep class okio.**{*;} #glide --dontwarn com.bumptech.glide.** \ No newline at end of file +-dontwarn com.bumptech.glide.** + +#bugly +-dontwarn com.tencent.bugly.** +-keep public class com.tencent.bugly.**{*;} \ No newline at end of file diff --git a/app/src/androidTest/java/com/idealclover/wheretosleepinnju/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/lilystudio/wheretosleepinnju/ExampleInstrumentedTest.java similarity index 82% rename from app/src/androidTest/java/com/idealclover/wheretosleepinnju/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/lilystudio/wheretosleepinnju/ExampleInstrumentedTest.java index 3f1dc14..379086a 100644 --- a/app/src/androidTest/java/com/idealclover/wheretosleepinnju/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/lilystudio/wheretosleepinnju/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju; +package com.lilystudio.wheretosleepinnju; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public void useAppContext() throws Exception { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.idealclover.wheretosleepinnju", appContext.getPackageName()); + assertEquals("com.lilystudio.wheretosleepinnju", appContext.getPackageName()); } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a35891e..74cd347 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,38 +1,48 @@ + package="com.lilystudio.wheretosleepinnju"> - + + + + + + + + - - - - - - + + + + + + - - + + @@ -40,6 +50,15 @@ android:name="android.appwidget.provider" android:resource="@xml/widget_one" /> + + + \ No newline at end of file diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/BaseView.java b/app/src/main/java/com/idealclover/wheretosleepinnju/BaseView.java deleted file mode 100644 index 32bcc1b..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/BaseView.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.idealclover.wheretosleepinnju; - -public interface BaseView { -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutContract.java b/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutContract.java deleted file mode 100644 index 34f7d77..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutContract.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.idealclover.wheretosleepinnju.about; - -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.bean.Version; - -/** - * Created by mnnyang on 17-11-3. - */ - -public interface AboutContract { - interface Presenter extends BasePresenter { - void checkUpdate(); - } - - interface View extends BaseView { - void showNotice(String notice); - void showUpdateVersionInfo(Version version); - } -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutPresenter.java b/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutPresenter.java deleted file mode 100644 index ce2a169..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutPresenter.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.idealclover.wheretosleepinnju.about; - -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Url; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.Version; -import com.idealclover.wheretosleepinnju.http.HttpCallback; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.VersionUpdate; - -/** - * Created by xxyangyoulin on 2018/3/13. - * Changed by idealclover on 18-09-06 - */ - -public class AboutPresenter implements AboutContract.Presenter { - private AboutContract.View mView; - - public AboutPresenter(AboutContract.View mView) { - this.mView = mView; - } - - @Override - public void start() { - - } - - @Override - public void checkUpdate() { - mView.showNotice(app.mContext.getString(R.string.checking_for_updates)); - - final VersionUpdate versionUpdate = new VersionUpdate(); - versionUpdate.checkUpdate(new HttpCallback() { - @Override - public void onSuccess(Version version) { - if (version == null) { - LogUtil.e(this, "version object is null"); - return; - } - int localVersion = versionUpdate.getLocalVersion(app.mContext); - - LogUtil.d(this, String.valueOf(version.getCode())); - if (version.getVersion() > localVersion) { - mView.showUpdateVersionInfo(version); - } else { - mView.showNotice(app.mContext.getString(R.string.already_the_latest_version)); - } - } - - @Override - public void onFail(String errMsg) { - LogUtil.e(this, errMsg); - ToastUtils.show(app.mContext.getString(R.string.access_update_err)); - } - }); - } -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Version.java b/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Version.java deleted file mode 100644 index b5bb788..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Version.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.idealclover.wheretosleepinnju.data.bean; - -/** - * Created by mnnyang on 17-11-7. - */ - -public class Version { - - /** - * version : 1 - * code : 1.0 - * msg : update info - * link : download link - */ - - private int version; - private String code; - private String msg; - private String link; - - public int getVersion() { - return version; - } - - public Version setVersion(int version) { - this.version = version; - return this; - } - - public String getCode() { - return code; - } - - public Version setCode(String code) { - this.code = code; - return this; - } - - public String getMsg() { - return msg; - } - - public Version setMsg(String msg) { - this.msg = msg; - return this; - } - - public String getLink() { - return link; - } - - public Version setLink(String link) { - this.link = link; - return this; - } -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptModel.java b/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptModel.java deleted file mode 100644 index 03db64f..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptModel.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.idealclover.wheretosleepinnju.impt; - -import android.graphics.Bitmap; -import android.widget.ImageView; - -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.http.HttpCallback; -import com.idealclover.wheretosleepinnju.http.HttpUtils; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; - -/** - * Created by mnnyang on 17-11-1. - */ - -public class ImptModel implements ImptContract.Model { - @Override - public void getCaptcha(final ImageView iv) { - - } -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingContract.java b/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingContract.java deleted file mode 100644 index 8e9c1fb..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingContract.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.idealclover.wheretosleepinnju.setting; - - -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.http.HttpCallback; - -/** - * Created by mnnyang on 17-10-3. - */ - -public interface SettingContract { - interface Presenter extends BasePresenter { - void feedback(); - } - - interface View extends BaseView { - void showNotice(String notice); - } -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/CheckUpdateUtil.java b/app/src/main/java/com/idealclover/wheretosleepinnju/utils/CheckUpdateUtil.java deleted file mode 100644 index c0ed9f4..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/CheckUpdateUtil.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.idealclover.wheretosleepinnju.utils; - -import android.app.Activity; -import android.content.Context; -import android.content.DialogInterface; - -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.Version; -import com.idealclover.wheretosleepinnju.http.HttpCallback; - - -public class CheckUpdateUtil { - - public static Context context; - - public static void init(Context context) { - CheckUpdateUtil.context = context.getApplicationContext(); - } - - public void checkUpdate(final Activity activity) { -// showNotice(app.mContext.getString(R.string.checking_for_updates)); - - final VersionUpdate versionUpdate = new VersionUpdate(); - versionUpdate.checkUpdate(new HttpCallback() { - @Override - public void onSuccess(Version version) { - if (version == null) { - LogUtil.e(this, "version object is null"); - return; - } - int localVersion = versionUpdate.getLocalVersion(app.mContext); - - LogUtil.d(this, String.valueOf(version.getCode())); - if (version.getVersion() > localVersion) { - showUpdateVersionInfo(activity, version); - } else { -// showNotice(app.mContext.getString(R.string.already_the_latest_version)); - } - } - - @Override - public void onFail(String errMsg) { - LogUtil.e(this, errMsg); -// ToastUtils.show(app.mContext.getString(R.string.access_update_err)); - } - }); - } - - public void showNotice(String notice) { - ToastUtils.show(notice); - } - - public void showUpdateVersionInfo(Activity activity, Version version) { - final String link = version.getLink(); - DialogHelper dialogHelper = new DialogHelper(); - dialogHelper.showNormalDialog(activity, app.mContext.getString(R.string.now_version), version.getMsg(), new DialogListener() { - public void onPositive(DialogInterface dialog, int which) { - super.onPositive(dialog, which); - VersionUpdate.goToMarket(context, link); - } - }); - } - - -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/VersionUpdate.java b/app/src/main/java/com/idealclover/wheretosleepinnju/utils/VersionUpdate.java deleted file mode 100644 index 86c19f0..0000000 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/VersionUpdate.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.idealclover.wheretosleepinnju.utils; - -import android.content.ActivityNotFoundException; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.net.Uri; - -import com.google.gson.Gson; -import com.idealclover.wheretosleepinnju.app.Url; -import com.idealclover.wheretosleepinnju.data.bean.Version; -import com.idealclover.wheretosleepinnju.http.HttpCallback; -import com.zhy.http.okhttp.OkHttpUtils; -import com.zhy.http.okhttp.callback.StringCallback; - -import okhttp3.Call; - -/** - * Created by mnnyang on 17-11-7. - * Changed by idealclover on 18-09-06 - */ - -public class VersionUpdate { - - public void checkUpdate(final HttpCallback callback) { - OkHttpUtils.get().url(Url.URL_CHECK_UPDATE_APP) - .build().execute(new StringCallback() { - @Override - public void onError(Call call, Exception e, int id) { - e.printStackTrace(); - callback.onFail(e.getMessage()); - } - - @Override - public void onResponse(String response, int id) { - try { - Gson gson = new Gson(); - Version version = gson.fromJson(response, Version.class); - callback.onSuccess(version); - } catch (Exception e) { - e.printStackTrace(); - callback.onFail("parse error"); - } - } - }); - } - - /** - * 获取本地软件版本号 - */ - public int getLocalVersion(Context ctx) { - int localVersion = 0; - try { - PackageInfo packageInfo = ctx.getApplicationContext() - .getPackageManager() - .getPackageInfo(ctx.getPackageName(), 0); - localVersion = packageInfo.versionCode; - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - } - return localVersion; - } - - /** - * 获取本地软件版本号名称 - */ - public String getLocalVersionName(Context ctx) { - String localVersion = ""; - try { - PackageInfo packageInfo = ctx.getApplicationContext() - .getPackageManager() - .getPackageInfo(ctx.getPackageName(), 0); - localVersion = packageInfo.versionName; - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - } - - return localVersion; - } - - public static void goToMarket(Context context, String link) { -// String packageName ="com.idealclover.njuclassschedule"; - String packageName ="com.idealclover.wheretosleepinnju"; -// Uri uri = Uri.parse("market://details?id=" + packageName); - Uri uri = Uri.parse(link); - Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri); - try { - context.startActivity(goToMarket); - } catch (ActivityNotFoundException e) { - e.printStackTrace(); - } - } -} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/BaseActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/BaseActivity.java similarity index 84% rename from app/src/main/java/com/idealclover/wheretosleepinnju/BaseActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/BaseActivity.java index 6929553..f065243 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/BaseActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/BaseActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju; +package com.lilystudio.wheretosleepinnju; import android.content.Intent; import android.os.Bundle; @@ -7,11 +7,11 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.utils.ActivityUtil; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.utils.ActivityUtil; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; /** diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/BasePresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/BasePresenter.java similarity index 56% rename from app/src/main/java/com/idealclover/wheretosleepinnju/BasePresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/BasePresenter.java index 307f2ba..d8f9f02 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/BasePresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/BasePresenter.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju; +package com.lilystudio.wheretosleepinnju; public interface BasePresenter { diff --git a/app/src/main/java/com/lilystudio/wheretosleepinnju/BaseView.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/BaseView.java new file mode 100644 index 0000000..b253ac1 --- /dev/null +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/BaseView.java @@ -0,0 +1,4 @@ +package com.lilystudio.wheretosleepinnju; + +public interface BaseView { +} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutActivity.java similarity index 70% rename from app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutActivity.java index 0ee29cb..24448b5 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutActivity.java @@ -1,6 +1,5 @@ -package com.idealclover.wheretosleepinnju.about; +package com.lilystudio.wheretosleepinnju.about; -import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -9,14 +8,9 @@ import android.view.View; import android.widget.TextView; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.Version; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.VersionUpdate; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; /** @@ -45,10 +39,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { private void initVersionName() { TextView tvVersionName = findViewById(R.id.tv_version); - - VersionUpdate vu = new VersionUpdate(); - String versionName = vu.getLocalVersionName(app.mContext); - tvVersionName.setText(versionName); + tvVersionName.setText(R.string.app_LTS); } private void initCheckUpdate() { @@ -102,19 +93,6 @@ public void showNotice(String notice) { ToastUtils.show(notice); } - @Override - public void showUpdateVersionInfo(Version version) { - final String link = version.getLink(); - DialogHelper dialogHelper = new DialogHelper(); - dialogHelper.showNormalDialog(this, getString(R.string.now_version), version.getMsg(), new DialogListener() { - @Override - public void onPositive(DialogInterface dialog, int which) { - super.onPositive(dialog, which); - VersionUpdate.goToMarket(getBaseContext(), link); - } - }); - } - @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { diff --git a/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutContract.java new file mode 100644 index 0000000..faa96ec --- /dev/null +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutContract.java @@ -0,0 +1,18 @@ +package com.lilystudio.wheretosleepinnju.about; + +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; + +/** + * Created by mnnyang on 17-11-3. + */ + +public interface AboutContract { + interface Presenter extends BasePresenter { + void checkUpdate(); + } + + interface View extends BaseView { + void showNotice(String notice); + } +} diff --git a/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutPresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutPresenter.java new file mode 100644 index 0000000..8ce4db8 --- /dev/null +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/about/AboutPresenter.java @@ -0,0 +1,25 @@ +package com.lilystudio.wheretosleepinnju.about; +import com.tencent.bugly.beta.Beta; + +/** + * Created by xxyangyoulin on 2018/3/13. + * Changed by idealclover on 18-09-06 + */ + +public class AboutPresenter implements AboutContract.Presenter { + private AboutContract.View mView; + + public AboutPresenter(AboutContract.View mView) { + this.mView = mView; + } + + @Override + public void start() { + + } + + @Override + public void checkUpdate() { + Beta.checkUpgrade(); + } +} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/add/AddActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddActivity.java similarity index 91% rename from app/src/main/java/com/idealclover/wheretosleepinnju/add/AddActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddActivity.java index 0de8009..f672436 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/add/AddActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.add; +package com.lilystudio.wheretosleepinnju.add; import android.content.DialogInterface; import android.content.Intent; @@ -10,18 +10,18 @@ import android.widget.Button; import android.widget.EditText; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.custom.AutoCompleteTextViewLayout; -import com.idealclover.wheretosleepinnju.custom.EditTextLayout; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.spec.PopupWindowDialog; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.custom.AutoCompleteTextViewLayout; +import com.lilystudio.wheretosleepinnju.custom.EditTextLayout; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.spec.PopupWindowDialog; public class AddActivity extends BaseActivity implements AddContract.View, View.OnClickListener { diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/add/AddContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddContract.java similarity index 69% rename from app/src/main/java/com/idealclover/wheretosleepinnju/add/AddContract.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddContract.java index e51932a..50d8892 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/add/AddContract.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddContract.java @@ -1,8 +1,8 @@ -package com.idealclover.wheretosleepinnju.add; +package com.lilystudio.wheretosleepinnju.add; -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; -import com.idealclover.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; +import com.lilystudio.wheretosleepinnju.data.bean.Course; /** * Created by mnnyang on 17-11-3. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/add/AddPresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddPresenter.java similarity index 90% rename from app/src/main/java/com/idealclover/wheretosleepinnju/add/AddPresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddPresenter.java index 9fe4bbd..45f7a78 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/add/AddPresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/add/AddPresenter.java @@ -1,10 +1,10 @@ -package com.idealclover.wheretosleepinnju.add; +package com.lilystudio.wheretosleepinnju.add; import android.text.TextUtils; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; /** * Created by mnnyang on 17-11-3. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/app/Constant.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/app/Constant.java similarity index 94% rename from app/src/main/java/com/idealclover/wheretosleepinnju/app/Constant.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/app/Constant.java index 7846fe8..a7aa717 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/app/Constant.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/app/Constant.java @@ -1,11 +1,11 @@ -package com.idealclover.wheretosleepinnju.app; -import com.idealclover.wheretosleepinnju.R; +package com.lilystudio.wheretosleepinnju.app; +import com.lilystudio.wheretosleepinnju.R; /** * Created by mnnyang on 17-10-20. */ public class Constant { - public static final String INTENT_UPDATE = "com.idealclover.update"; + public static final String INTENT_UPDATE = "com.lilystudio.update"; public static final String INTENT_UPDATE_TYPE = "intent_update_type"; public static final int INTENT_UPDATE_TYPE_OTHER = 2; public static final int INTENT_UPDATE_TYPE_COURSE = 1; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/app/Url.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/app/Url.java similarity index 96% rename from app/src/main/java/com/idealclover/wheretosleepinnju/app/Url.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/app/Url.java index cf466c7..99472c7 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/app/Url.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/app/Url.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.app; +package com.lilystudio.wheretosleepinnju.app; /** * Created by mnnyang on 17-10-23. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/app/app.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/app/app.java similarity index 86% rename from app/src/main/java/com/idealclover/wheretosleepinnju/app/app.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/app/app.java index 9f318e4..57f4057 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/app/app.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/app/app.java @@ -1,14 +1,15 @@ -package com.idealclover.wheretosleepinnju.app; +package com.lilystudio.wheretosleepinnju.app; import android.app.Application; import android.content.Context; import android.os.Handler; import android.os.Looper; -import com.idealclover.wheretosleepinnju.utils.CheckUpdateUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ScreenUtils; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.ScreenUtils; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; +import com.tencent.bugly.Bugly; import com.zhy.http.okhttp.OkHttpUtils; import com.zhy.http.okhttp.cookie.CookieJarImpl; import com.zhy.http.okhttp.cookie.store.MemoryCookieStore; @@ -76,9 +77,9 @@ public void saveFromResponse(HttpUrl arg0, List cookies) { } private void initUtils() { + Bugly.init(mContext, getString(R.string.bugly_appid), false); ToastUtils.init(mContext); Preferences.init(mContext); ScreenUtils.init(mContext); - CheckUpdateUtil.init(mContext); } } diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfActivity.java similarity index 88% rename from app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfActivity.java index a90c712..0a8bc5f 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.conf; +package com.lilystudio.wheretosleepinnju.conf; import android.Manifest; import android.content.Intent; @@ -10,15 +10,15 @@ import android.view.MenuItem; import android.view.View; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.custom.settting.SettingItemNormal; -import com.idealclover.wheretosleepinnju.utils.FileUtils; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.RequestPermission; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.spec.SelectImageHelper; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.custom.settting.SettingItemNormal; +import com.lilystudio.wheretosleepinnju.utils.FileUtils; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.RequestPermission; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.utils.spec.SelectImageHelper; /** * Created by xxyangyoulin on 2018/3/13. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfContract.java similarity index 59% rename from app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfContract.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfContract.java index f032bcf..3b10f28 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfContract.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfContract.java @@ -1,7 +1,7 @@ -package com.idealclover.wheretosleepinnju.conf; +package com.lilystudio.wheretosleepinnju.conf; -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; /** * Created by mnnyang on 17-11-3. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfPresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfPresenter.java similarity index 86% rename from app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfPresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfPresenter.java index 2edc974..63cfbbc 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/conf/ConfPresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/conf/ConfPresenter.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.conf; +package com.lilystudio.wheretosleepinnju.conf; /** * Created by xxyangyoulin on 2018/3/13. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/course/CourseActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/course/CourseActivity.java similarity index 91% rename from app/src/main/java/com/idealclover/wheretosleepinnju/course/CourseActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/course/CourseActivity.java index 26973e5..4064552 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/course/CourseActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/course/CourseActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.course; +package com.lilystudio.wheretosleepinnju.course; import android.app.Activity; import android.content.BroadcastReceiver; @@ -28,28 +28,27 @@ import android.widget.PopupWindow; import android.widget.TextView; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.add.AddActivity; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.custom.course.CourseTableView; -import com.idealclover.wheretosleepinnju.custom.course.CourseView; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.setting.SettingActivity; -import com.idealclover.wheretosleepinnju.utils.CheckUpdateUtil; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.TimeUtils; -import com.idealclover.wheretosleepinnju.utils.spec.ShowDetailDialog; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.add.AddActivity; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.custom.course.CourseTableView; +import com.lilystudio.wheretosleepinnju.custom.course.CourseView; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.setting.SettingActivity; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.TimeUtils; +import com.lilystudio.wheretosleepinnju.utils.spec.ShowDetailDialog; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import static com.idealclover.wheretosleepinnju.app.Constant.INTENT_UPDATE_TYPE_OTHER; +import static com.lilystudio.wheretosleepinnju.app.Constant.INTENT_UPDATE_TYPE_OTHER; public class CourseActivity extends BaseActivity implements CourseContract.View, View.OnClickListener, CourseTableView.OnItemClickListener { @@ -82,7 +81,6 @@ public void onCreate(Bundle savedInstanceState) { mPresenter = new CoursePresenter(this); updateView(); - checkUpdate(this); } private void initBackground() { @@ -399,11 +397,6 @@ private void fab(View v) { startActivity(intent); } - private void checkUpdate(Activity activity) { - CheckUpdateUtil checkUpdateUtil = new CheckUpdateUtil(); - checkUpdateUtil.checkUpdate(this); - } - @Override public boolean onKeyDown(int keyCode, KeyEvent event) { switch (keyCode) { diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/course/CourseContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/course/CourseContract.java similarity index 73% rename from app/src/main/java/com/idealclover/wheretosleepinnju/course/CourseContract.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/course/CourseContract.java index bd7cfe3..f819199 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/course/CourseContract.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/course/CourseContract.java @@ -1,11 +1,11 @@ -package com.idealclover.wheretosleepinnju.course; +package com.lilystudio.wheretosleepinnju.course; import android.graphics.Bitmap; -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; -import com.idealclover.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; +import com.lilystudio.wheretosleepinnju.data.bean.Course; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/course/CoursePresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/course/CoursePresenter.java similarity index 86% rename from app/src/main/java/com/idealclover/wheretosleepinnju/course/CoursePresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/course/CoursePresenter.java index f417377..31d33eb 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/course/CoursePresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/course/CoursePresenter.java @@ -1,17 +1,16 @@ -package com.idealclover.wheretosleepinnju.course; +package com.lilystudio.wheretosleepinnju.course; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.text.TextUtils; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.utils.ImageResizer; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ScreenUtils; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.utils.ImageResizer; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.ScreenUtils; import java.io.FileNotFoundException; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/AutoCompleteTextViewLayout.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/AutoCompleteTextViewLayout.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/AutoCompleteTextViewLayout.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/AutoCompleteTextViewLayout.java index bd85ece..e38e662 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/AutoCompleteTextViewLayout.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/AutoCompleteTextViewLayout.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.custom; +package com.lilystudio.wheretosleepinnju.custom; import android.content.Context; import android.content.res.TypedArray; @@ -14,7 +14,7 @@ import android.widget.LinearLayout; import android.widget.ListAdapter; -import com.idealclover.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.R; /** diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/ColorImageView.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/ColorImageView.java similarity index 95% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/ColorImageView.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/ColorImageView.java index d0304f8..dfe18ac 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/ColorImageView.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/ColorImageView.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.custom; +package com.lilystudio.wheretosleepinnju.custom; import android.annotation.SuppressLint; import android.content.Context; @@ -10,7 +10,7 @@ import android.util.AttributeSet; import android.widget.ImageView; -import com.idealclover.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.R; /** * ColorImageView diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/EditTextLayout.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/EditTextLayout.java similarity index 97% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/EditTextLayout.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/EditTextLayout.java index 8db32d6..f397523 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/EditTextLayout.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/EditTextLayout.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.custom; +package com.lilystudio.wheretosleepinnju.custom; import android.content.Context; import android.content.res.TypedArray; @@ -12,7 +12,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import com.idealclover.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.R; /** * Created by mnnyang on 17-11-5. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/WheelView.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/WheelView.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/WheelView.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/WheelView.java index 9cf2b49..97f306f 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/WheelView.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/WheelView.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.custom; +package com.lilystudio.wheretosleepinnju.custom; import android.annotation.SuppressLint; import android.app.Activity; @@ -19,8 +19,8 @@ import android.widget.ScrollView; import android.widget.TextView; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.utils.ColorUtil; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.utils.ColorUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/course/CourseTableView.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/course/CourseTableView.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/course/CourseTableView.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/course/CourseTableView.java index 8b33b49..9ff092b 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/course/CourseTableView.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/course/CourseTableView.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.custom.course; +package com.lilystudio.wheretosleepinnju.custom.course; import android.content.Context; import android.graphics.Canvas; @@ -21,17 +21,17 @@ import android.widget.TextView; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.custom.util.Utils; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.custom.util.Utils; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; import java.util.ArrayList; import java.util.HashMap; import static android.widget.LinearLayout.VERTICAL; -import static com.idealclover.wheretosleepinnju.custom.util.Utils.dip2px; -import static com.idealclover.wheretosleepinnju.custom.util.Utils.getColors; +import static com.lilystudio.wheretosleepinnju.custom.util.Utils.dip2px; +import static com.lilystudio.wheretosleepinnju.custom.util.Utils.getColors; /** * Created by mnnyang on 17-10-20. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/course/CourseView.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/course/CourseView.java similarity index 97% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/course/CourseView.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/course/CourseView.java index 13dd982..4da4a71 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/course/CourseView.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/course/CourseView.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.custom.course; +package com.lilystudio.wheretosleepinnju.custom.course; import android.content.Context; import android.graphics.Canvas; @@ -15,11 +15,11 @@ import android.widget.ScrollView; import android.widget.TextView; -import com.idealclover.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.bean.Course; import java.util.ArrayList; -import static com.idealclover.wheretosleepinnju.custom.util.Utils.dip2px; +import static com.lilystudio.wheretosleepinnju.custom.util.Utils.dip2px; /** * Created by mnnyang on 17-10-20. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/settting/SettingItemNormal.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/settting/SettingItemNormal.java similarity index 95% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/settting/SettingItemNormal.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/settting/SettingItemNormal.java index f22a4d9..efe5c1c 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/settting/SettingItemNormal.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/settting/SettingItemNormal.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.custom.settting; +package com.lilystudio.wheretosleepinnju.custom.settting; import android.content.Context; import android.content.res.TypedArray; @@ -8,12 +8,11 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; -import android.widget.CompoundButton; import android.widget.LinearLayout; import android.widget.TextView; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; /** * 设置选项 diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/util/Utils.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/util/Utils.java similarity index 97% rename from app/src/main/java/com/idealclover/wheretosleepinnju/custom/util/Utils.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/custom/util/Utils.java index 1e8affa..306eee3 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/custom/util/Utils.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/custom/util/Utils.java @@ -1,11 +1,11 @@ -package com.idealclover.wheretosleepinnju.custom.util; +package com.lilystudio.wheretosleepinnju.custom.util; import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.StateListDrawable; -import com.idealclover.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.R; /** diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Course.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/Course.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Course.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/Course.java index 5234195..e7e6f83 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Course.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/Course.java @@ -1,9 +1,9 @@ -package com.idealclover.wheretosleepinnju.data.bean; +package com.lilystudio.wheretosleepinnju.data.bean; import android.support.annotation.NonNull; -import com.idealclover.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CourseTime.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CourseTime.java similarity index 91% rename from app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CourseTime.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CourseTime.java index 46507c5..8552a47 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CourseTime.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CourseTime.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.data.bean; +package com.lilystudio.wheretosleepinnju.data.bean; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CsItem.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CsItem.java similarity index 89% rename from app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CsItem.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CsItem.java index 977339e..f70d9c2 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CsItem.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CsItem.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.data.bean; +package com.lilystudio.wheretosleepinnju.data.bean; /** * Created by mnnyang on 17-11-4. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CsName.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CsName.java similarity index 93% rename from app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CsName.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CsName.java index e125449..20a05b3 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/CsName.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/bean/CsName.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.data.bean; +package com.lilystudio.wheretosleepinnju.data.bean; /** * Created by mnnyang on 17-11-4. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CourseDbDao.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CourseDbDao.java similarity index 97% rename from app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CourseDbDao.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CourseDbDao.java index 2f21f97..92142e7 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CourseDbDao.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CourseDbDao.java @@ -1,15 +1,15 @@ -package com.idealclover.wheretosleepinnju.data.db; +package com.lilystudio.wheretosleepinnju.data.db; import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.support.annotation.NonNull; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.bean.CsItem; -import com.idealclover.wheretosleepinnju.data.bean.CsName; -import com.idealclover.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.bean.CsItem; +import com.lilystudio.wheretosleepinnju.data.bean.CsName; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CourseDbHelper.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CourseDbHelper.java similarity index 92% rename from app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CourseDbHelper.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CourseDbHelper.java index b0deb38..1213ccd 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CourseDbHelper.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CourseDbHelper.java @@ -1,12 +1,10 @@ -package com.idealclover.wheretosleepinnju.data.db; +package com.lilystudio.wheretosleepinnju.data.db; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.R; /** * Created by mnnyang on 17-10-23. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CoursesPsc.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CoursesPsc.java similarity index 96% rename from app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CoursesPsc.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CoursesPsc.java index 10614cd..eab31f8 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/data/db/CoursesPsc.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/data/db/CoursesPsc.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.data.db; +package com.lilystudio.wheretosleepinnju.data.db; import android.provider.BaseColumns; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/http/HttpCallback.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/http/HttpCallback.java similarity index 73% rename from app/src/main/java/com/idealclover/wheretosleepinnju/http/HttpCallback.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/http/HttpCallback.java index a10a7d8..b8418bf 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/http/HttpCallback.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/http/HttpCallback.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.http; +package com.lilystudio.wheretosleepinnju.http; public abstract class HttpCallback { public abstract void onSuccess(T t); diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/http/HttpUtils.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/http/HttpUtils.java similarity index 91% rename from app/src/main/java/com/idealclover/wheretosleepinnju/http/HttpUtils.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/http/HttpUtils.java index a6a8ac6..3cfb609 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/http/HttpUtils.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/http/HttpUtils.java @@ -1,15 +1,13 @@ -package com.idealclover.wheretosleepinnju.http; +package com.lilystudio.wheretosleepinnju.http; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.text.TextUtils; - -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Url; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.spec.ParseCourse; -import com.idealclover.wheretosleepinnju.utils.LogUtil; + +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.Url; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.utils.spec.ParseCourse; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; import com.zhy.http.okhttp.OkHttpUtils; import com.zhy.http.okhttp.callback.FileCallBack; import com.zhy.http.okhttp.callback.StringCallback; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptActivity.java similarity index 89% rename from app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptActivity.java index f2b19ae..3896a8c 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.impt; +package com.lilystudio.wheretosleepinnju.impt; import android.content.DialogInterface; import android.content.Intent; @@ -14,18 +14,18 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.app.Url; -import com.idealclover.wheretosleepinnju.course.CourseActivity; -import com.idealclover.wheretosleepinnju.custom.EditTextLayout; -import com.idealclover.wheretosleepinnju.data.bean.CourseTime; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.spec.ShowTermDialog; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.app.Url; +import com.lilystudio.wheretosleepinnju.course.CourseActivity; +import com.lilystudio.wheretosleepinnju.custom.EditTextLayout; +import com.lilystudio.wheretosleepinnju.data.bean.CourseTime; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.utils.spec.ShowTermDialog; /** * Changed by idealclover on 18-07-07 diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptContract.java similarity index 78% rename from app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptContract.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptContract.java index c194add..3fae1ec 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptContract.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptContract.java @@ -1,11 +1,11 @@ -package com.idealclover.wheretosleepinnju.impt; +package com.lilystudio.wheretosleepinnju.impt; import android.widget.ImageView; -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; -import com.idealclover.wheretosleepinnju.data.bean.CourseTime; +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; +import com.lilystudio.wheretosleepinnju.data.bean.CourseTime; /** * Created by mnnyang on 17-10-3. diff --git a/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptModel.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptModel.java new file mode 100644 index 0000000..5f06eab --- /dev/null +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptModel.java @@ -0,0 +1,16 @@ +package com.lilystudio.wheretosleepinnju.impt; + +import android.widget.ImageView; + +import com.lilystudio.wheretosleepinnju.R; + +/** + * Created by mnnyang on 17-11-1. + */ + +public class ImptModel implements ImptContract.Model { + @Override + public void getCaptcha(final ImageView iv) { + + } +} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptPresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptPresenter.java similarity index 90% rename from app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptPresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptPresenter.java index f9bbd65..aff0ac0 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptPresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/impt/ImptPresenter.java @@ -1,18 +1,18 @@ -package com.idealclover.wheretosleepinnju.impt; +package com.lilystudio.wheretosleepinnju.impt; import android.graphics.Bitmap; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.bean.CourseTime; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.http.HttpCallback; -import com.idealclover.wheretosleepinnju.http.HttpUtils; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.spec.ParseCourse; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.bean.CourseTime; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.http.HttpCallback; +import com.lilystudio.wheretosleepinnju.http.HttpUtils; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.utils.spec.ParseCourse; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.Preferences; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgActivity.java similarity index 92% rename from app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgActivity.java index a1aea1c..f886b5e 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.mg; +package com.lilystudio.wheretosleepinnju.mg; import android.content.DialogInterface; import android.content.Intent; @@ -14,18 +14,18 @@ import android.view.View; import android.widget.EditText; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.course.CourseActivity; -import com.idealclover.wheretosleepinnju.data.bean.CsItem; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.mg.adapter.MgAdapter; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.spec.RecyclerBaseAdapter; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.course.CourseActivity; +import com.lilystudio.wheretosleepinnju.data.bean.CsItem; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.mg.adapter.MgAdapter; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.utils.spec.RecyclerBaseAdapter; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgContract.java similarity index 72% rename from app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgContract.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgContract.java index 79a10ad..2915573 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgContract.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgContract.java @@ -1,9 +1,9 @@ -package com.idealclover.wheretosleepinnju.mg; +package com.lilystudio.wheretosleepinnju.mg; -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; -import com.idealclover.wheretosleepinnju.data.bean.CsItem; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; +import com.lilystudio.wheretosleepinnju.data.bean.CsItem; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgModel.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgModel.java similarity index 60% rename from app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgModel.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgModel.java index 6356266..d1ece06 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgModel.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgModel.java @@ -1,7 +1,7 @@ -package com.idealclover.wheretosleepinnju.mg; +package com.lilystudio.wheretosleepinnju.mg; -import com.idealclover.wheretosleepinnju.data.bean.CsItem; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.data.bean.CsItem; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgPresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgPresenter.java similarity index 91% rename from app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgPresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgPresenter.java index b92a59e..b20d514 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/MgPresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/MgPresenter.java @@ -1,13 +1,13 @@ -package com.idealclover.wheretosleepinnju.mg; +package com.lilystudio.wheretosleepinnju.mg; import android.text.TextUtils; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.CsItem; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.data.bean.CsItem; +import com.lilystudio.wheretosleepinnju.data.db.CourseDbDao; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.Preferences; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/adapter/MgAdapter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/adapter/MgAdapter.java similarity index 90% rename from app/src/main/java/com/idealclover/wheretosleepinnju/mg/adapter/MgAdapter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/mg/adapter/MgAdapter.java index 04a6159..d840949 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/mg/adapter/MgAdapter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/mg/adapter/MgAdapter.java @@ -1,11 +1,11 @@ -package com.idealclover.wheretosleepinnju.mg.adapter; +package com.lilystudio.wheretosleepinnju.mg.adapter; import android.support.annotation.NonNull; import android.view.View; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.data.bean.CsItem; -import com.idealclover.wheretosleepinnju.utils.spec.RecyclerBaseAdapter; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.data.bean.CsItem; +import com.lilystudio.wheretosleepinnju.utils.spec.RecyclerBaseAdapter; import java.util.List; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolActivity.java similarity index 90% rename from app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolActivity.java index 4b5f05d..8b8a511 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.school; +package com.lilystudio.wheretosleepinnju.school; import android.content.DialogInterface; import android.content.Intent; @@ -11,13 +11,13 @@ import android.widget.EditText; import android.widget.TextView; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.app.Url; -import com.idealclover.wheretosleepinnju.impt.ImptActivity; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.app.Url; +import com.lilystudio.wheretosleepinnju.impt.ImptActivity; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; /** * Created by xxyangyoulin on 2018/4/9. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolContract.java similarity index 72% rename from app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolContract.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolContract.java index d0acff7..3520424 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolContract.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolContract.java @@ -1,8 +1,8 @@ -package com.idealclover.wheretosleepinnju.school; +package com.lilystudio.wheretosleepinnju.school; -import com.idealclover.wheretosleepinnju.BasePresenter; -import com.idealclover.wheretosleepinnju.BaseView; +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; /** * Created by mnnyang on 17-10-3. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolPresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolPresenter.java similarity index 86% rename from app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolPresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolPresenter.java index 33d33d9..c99edd7 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/school/SchoolPresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/school/SchoolPresenter.java @@ -1,7 +1,7 @@ -package com.idealclover.wheretosleepinnju.school; +package com.lilystudio.wheretosleepinnju.school; -import com.idealclover.wheretosleepinnju.http.HttpCallback; -import com.idealclover.wheretosleepinnju.http.HttpUtils; +import com.lilystudio.wheretosleepinnju.http.HttpCallback; +import com.lilystudio.wheretosleepinnju.http.HttpUtils; /** * Created by xxyangyoulin on 2018/4/9. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingActivity.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingActivity.java similarity index 84% rename from app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingActivity.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingActivity.java index e2d66c7..d18ebdc 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingActivity.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingActivity.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.setting; +package com.lilystudio.wheretosleepinnju.setting; import android.content.DialogInterface; import android.content.Intent; @@ -13,28 +13,26 @@ import android.widget.RadioGroup; import android.widget.ScrollView; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.about.AboutActivity; -import com.idealclover.wheretosleepinnju.add.AddActivity; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.course.CourseActivity; -import com.idealclover.wheretosleepinnju.custom.settting.SettingItemNormal; -import com.idealclover.wheretosleepinnju.impt.ImptActivity; -import com.idealclover.wheretosleepinnju.mg.MgActivity; -import com.idealclover.wheretosleepinnju.school.SchoolActivity; -import com.idealclover.wheretosleepinnju.utils.ActivityUtil; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ScreenUtils; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.VersionUpdate; -import com.idealclover.wheretosleepinnju.utils.AlipayDonate; - -import static com.idealclover.wheretosleepinnju.app.Constant.themeColorArray; -import static com.idealclover.wheretosleepinnju.app.Constant.themeNameArray; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.about.AboutActivity; +import com.lilystudio.wheretosleepinnju.add.AddActivity; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.course.CourseActivity; +import com.lilystudio.wheretosleepinnju.custom.settting.SettingItemNormal; +import com.lilystudio.wheretosleepinnju.impt.ImptActivity; +import com.lilystudio.wheretosleepinnju.mg.MgActivity; +import com.lilystudio.wheretosleepinnju.utils.ActivityUtil; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.ScreenUtils; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.utils.AlipayDonate; + +import static com.lilystudio.wheretosleepinnju.app.Constant.themeColorArray; +import static com.lilystudio.wheretosleepinnju.app.Constant.themeNameArray; public class SettingActivity extends BaseActivity implements SettingContract.View, SettingItemNormal.SettingOnClickListener { @@ -102,10 +100,6 @@ private void initDefaultValues() { .getBoolean(getString(R.string.app_preference_hide_fab), false)); // true)); - - VersionUpdate vu = new VersionUpdate(); - String versionName = vu.getLocalVersionName(app.mContext); - sinAbout.setSummary(versionName); } @Override diff --git a/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingContract.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingContract.java new file mode 100644 index 0000000..8344005 --- /dev/null +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingContract.java @@ -0,0 +1,19 @@ +package com.lilystudio.wheretosleepinnju.setting; + + +import com.lilystudio.wheretosleepinnju.BasePresenter; +import com.lilystudio.wheretosleepinnju.BaseView; + +/** + * Created by mnnyang on 17-10-3. + */ + +public interface SettingContract { + interface Presenter extends BasePresenter { + void feedback(); + } + + interface View extends BaseView { + void showNotice(String notice); + } +} diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingFragment.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingFragment.java similarity index 85% rename from app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingFragment.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingFragment.java index 1cf1ffc..f2ebd0c 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingFragment.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingFragment.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.setting; +package com.lilystudio.wheretosleepinnju.setting; import android.content.Context; import android.content.DialogInterface; @@ -15,25 +15,25 @@ import android.widget.RadioGroup; import android.widget.ScrollView; -import com.idealclover.wheretosleepinnju.BaseActivity; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.add.AddActivity; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.course.CourseActivity; -import com.idealclover.wheretosleepinnju.mg.MgActivity; -import com.idealclover.wheretosleepinnju.impt.ImptActivity; -import com.idealclover.wheretosleepinnju.utils.ActivityUtil; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ScreenUtils; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.BaseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.add.AddActivity; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.course.CourseActivity; +import com.lilystudio.wheretosleepinnju.mg.MgActivity; +import com.lilystudio.wheretosleepinnju.impt.ImptActivity; +import com.lilystudio.wheretosleepinnju.utils.ActivityUtil; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.utils.Preferences; +import com.lilystudio.wheretosleepinnju.utils.ScreenUtils; +import com.lilystudio.wheretosleepinnju.utils.ToastUtils; import java.util.List; -import static com.idealclover.wheretosleepinnju.app.Constant.themeColorArray; -import static com.idealclover.wheretosleepinnju.app.Constant.themeNameArray; +import static com.lilystudio.wheretosleepinnju.app.Constant.themeColorArray; +import static com.lilystudio.wheretosleepinnju.app.Constant.themeNameArray; public class SettingFragment extends PreferenceFragment implements SettingContract.View { diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingPresenter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingPresenter.java similarity index 57% rename from app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingPresenter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingPresenter.java index 51043c0..bfaf575 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingPresenter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/setting/SettingPresenter.java @@ -1,38 +1,15 @@ -package com.idealclover.wheretosleepinnju.setting; +package com.lilystudio.wheretosleepinnju.setting; -import android.app.Activity; -import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; -import android.support.v7.app.AlertDialog; -import com.google.gson.Gson; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.bean.Version; -import com.idealclover.wheretosleepinnju.data.db.CourseDbDao; -import com.idealclover.wheretosleepinnju.http.HttpCallback; -import com.idealclover.wheretosleepinnju.http.HttpUtils; -import com.idealclover.wheretosleepinnju.utils.ActivityUtil; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; -import com.idealclover.wheretosleepinnju.utils.VersionUpdate; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.app; -import java.util.ArrayList; import java.util.List; -import rx.Observable; -import rx.Observer; -import rx.Subscriber; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - /** * Created by mnnyang on 17-10-19. */ diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ActivityUtil.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ActivityUtil.java similarity index 93% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/ActivityUtil.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ActivityUtil.java index eb40d61..b21a6bc 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ActivityUtil.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ActivityUtil.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.app.Activity; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/AlipayDonate.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/AlipayDonate.java similarity index 99% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/AlipayDonate.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/AlipayDonate.java index 9a57ffa..0788871 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/AlipayDonate.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/AlipayDonate.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.app.Activity; import android.content.ActivityNotFoundException; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ButtonHandler.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ButtonHandler.java similarity index 94% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/ButtonHandler.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ButtonHandler.java index 0ae6c4a..ee3719f 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ButtonHandler.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ButtonHandler.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.content.DialogInterface; import android.os.Handler; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ColorUtil.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ColorUtil.java similarity index 82% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/ColorUtil.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ColorUtil.java index 95799dc..cc8f3ad 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ColorUtil.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ColorUtil.java @@ -1,11 +1,10 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.content.Context; import android.content.res.TypedArray; import android.util.TypedValue; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.R; /** * Created by mnnyang on 17-11-8. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/DialogHelper.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/DialogHelper.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/DialogHelper.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/DialogHelper.java index e43e1ed..a4356f5 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/DialogHelper.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/DialogHelper.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.app.Activity; import android.app.ProgressDialog; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/DialogListener.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/DialogListener.java similarity index 85% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/DialogListener.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/DialogListener.java index 84b4750..49721bc 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/DialogListener.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/DialogListener.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.content.DialogInterface; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/FileUtils.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/FileUtils.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/FileUtils.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/FileUtils.java index d48a657..e1a99a9 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/FileUtils.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/FileUtils.java @@ -1,9 +1,8 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; -import android.media.MediaScannerConnection; import android.net.Uri; import android.os.Environment; import android.provider.MediaStore; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ImageResizer.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ImageResizer.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/ImageResizer.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ImageResizer.java index 8e3e623..513977f 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ImageResizer.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ImageResizer.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/LogUtil.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/LogUtil.java similarity index 97% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/LogUtil.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/LogUtil.java index a11e77c..e593b38 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/LogUtil.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/LogUtil.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.util.Log; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/Preferences.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/Preferences.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/Preferences.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/Preferences.java index 398c386..2821468 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/Preferences.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/Preferences.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.content.Context; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/RequestPermission.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/RequestPermission.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/RequestPermission.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/RequestPermission.java index 7c6d9e1..e7cd93e 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/RequestPermission.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/RequestPermission.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.annotation.TargetApi; import android.app.Activity; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ScreenUtils.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ScreenUtils.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/ScreenUtils.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ScreenUtils.java index 8612491..cc96847 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ScreenUtils.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ScreenUtils.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/TimeUtils.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/TimeUtils.java similarity index 95% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/TimeUtils.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/TimeUtils.java index 3319e2f..2ae3eb8 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/TimeUtils.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/TimeUtils.java @@ -1,8 +1,7 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import java.util.Calendar; import java.util.Date; -import java.util.GregorianCalendar; /** * Created by mnnyang on 17-11-2. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ToastUtils.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ToastUtils.java similarity index 95% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/ToastUtils.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ToastUtils.java index 97b9c16..1b6f377 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/ToastUtils.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/ToastUtils.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils; +package com.lilystudio.wheretosleepinnju.utils; import android.content.Context; import android.os.Handler; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/BackupUtil.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/BackupUtil.java similarity index 81% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/BackupUtil.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/BackupUtil.java index 7c6ba55..d859497 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/BackupUtil.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/BackupUtil.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils.spec; +package com.lilystudio.wheretosleepinnju.utils.spec; /** * Created by xxyangyoulin on 2018/4/9. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ParseCourse.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ParseCourse.java similarity index 94% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ParseCourse.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ParseCourse.java index b73ff68..ef0a917 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ParseCourse.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ParseCourse.java @@ -1,13 +1,11 @@ -package com.idealclover.wheretosleepinnju.utils.spec; - -import android.util.Log; - -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.app.Url; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.data.bean.CourseTime; -import com.idealclover.wheretosleepinnju.data.db.CoursesPsc; -import com.idealclover.wheretosleepinnju.utils.LogUtil; +package com.lilystudio.wheretosleepinnju.utils.spec; + +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.app.Url; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.data.bean.CourseTime; +import com.lilystudio.wheretosleepinnju.data.db.CoursesPsc; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/PopupWindowDialog.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/PopupWindowDialog.java similarity index 92% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/PopupWindowDialog.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/PopupWindowDialog.java index 18acf0d..d69fc58 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/PopupWindowDialog.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/PopupWindowDialog.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils.spec; +package com.lilystudio.wheretosleepinnju.utils.spec; import android.app.Activity; import android.content.DialogInterface; @@ -6,16 +6,15 @@ import android.view.View; import android.widget.RadioGroup; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.app.app; -import com.idealclover.wheretosleepinnju.custom.WheelView; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; -import com.idealclover.wheretosleepinnju.utils.LogUtil; -import com.idealclover.wheretosleepinnju.utils.Preferences; -import com.idealclover.wheretosleepinnju.utils.ToastUtils; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.app.app; +import com.lilystudio.wheretosleepinnju.custom.WheelView; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.utils.Preferences; import java.util.ArrayList; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/RecyclerBaseAdapter.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/RecyclerBaseAdapter.java similarity index 98% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/RecyclerBaseAdapter.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/RecyclerBaseAdapter.java index fc381ab..8453681 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/RecyclerBaseAdapter.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/RecyclerBaseAdapter.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils.spec; +package com.lilystudio.wheretosleepinnju.utils.spec; import android.graphics.Bitmap; import android.support.annotation.LayoutRes; diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/SelectImageHelper.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/SelectImageHelper.java similarity index 86% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/SelectImageHelper.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/SelectImageHelper.java index 8c690d2..6d44515 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/SelectImageHelper.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/SelectImageHelper.java @@ -1,13 +1,10 @@ -package com.idealclover.wheretosleepinnju.utils.spec; +package com.lilystudio.wheretosleepinnju.utils.spec; import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.provider.MediaStore; -import com.idealclover.wheretosleepinnju.app.Url; -import com.idealclover.wheretosleepinnju.utils.LogUtil; - import java.io.File; /** diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ShowDetailDialog.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ShowDetailDialog.java similarity index 93% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ShowDetailDialog.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ShowDetailDialog.java index d593b78..b7a9098 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ShowDetailDialog.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ShowDetailDialog.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils.spec; +package com.lilystudio.wheretosleepinnju.utils.spec; import android.app.Activity; import android.content.Intent; @@ -12,11 +12,11 @@ import android.widget.PopupWindow; import android.widget.TextView; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.add.AddActivity; -import com.idealclover.wheretosleepinnju.app.Constant; -import com.idealclover.wheretosleepinnju.data.bean.Course; -import com.idealclover.wheretosleepinnju.utils.LogUtil; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.add.AddActivity; +import com.lilystudio.wheretosleepinnju.app.Constant; +import com.lilystudio.wheretosleepinnju.data.bean.Course; +import com.lilystudio.wheretosleepinnju.utils.LogUtil; /** * 显示详细信息 diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ShowTermDialog.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ShowTermDialog.java similarity index 93% rename from app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ShowTermDialog.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ShowTermDialog.java index 6c65881..ddf43f6 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/spec/ShowTermDialog.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/utils/spec/ShowTermDialog.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.utils.spec; +package com.lilystudio.wheretosleepinnju.utils.spec; import android.content.Context; import android.content.DialogInterface; @@ -8,10 +8,10 @@ import android.widget.LinearLayout; import android.widget.RadioGroup; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.utils.ColorUtil; -import com.idealclover.wheretosleepinnju.utils.DialogHelper; -import com.idealclover.wheretosleepinnju.utils.DialogListener; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.utils.ColorUtil; +import com.lilystudio.wheretosleepinnju.utils.DialogHelper; +import com.lilystudio.wheretosleepinnju.utils.DialogListener; /** * Created by mnnyang on 17-11-4. diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/widget/OneWidget.java b/app/src/main/java/com/lilystudio/wheretosleepinnju/widget/OneWidget.java similarity index 86% rename from app/src/main/java/com/idealclover/wheretosleepinnju/widget/OneWidget.java rename to app/src/main/java/com/lilystudio/wheretosleepinnju/widget/OneWidget.java index 4f15896..3aa3ca8 100644 --- a/app/src/main/java/com/idealclover/wheretosleepinnju/widget/OneWidget.java +++ b/app/src/main/java/com/lilystudio/wheretosleepinnju/widget/OneWidget.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju.widget; +package com.lilystudio.wheretosleepinnju.widget; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; @@ -7,8 +7,8 @@ import android.content.Intent; import android.widget.RemoteViews; -import com.idealclover.wheretosleepinnju.R; -import com.idealclover.wheretosleepinnju.course.CourseActivity; +import com.lilystudio.wheretosleepinnju.R; +import com.lilystudio.wheretosleepinnju.course.CourseActivity; /** * Created by xxyangyoulin on 2018/4/4. diff --git a/app/src/main/res/layout/activity_add.xml b/app/src/main/res/layout/activity_add.xml index d2ce751..eda31bc 100644 --- a/app/src/main/res/layout/activity_add.xml +++ b/app/src/main/res/layout/activity_add.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:gravity="center_horizontal" android:orientation="vertical" - tools:context="com.idealclover.wheretosleepinnju.add.AddActivity" + tools:context="com.lilystudio.wheretosleepinnju.add.AddActivity" android:focusable="true" android:focusableInTouchMode="true"> @@ -61,7 +61,7 @@ android:orientation="vertical" android:padding="8dp"> - - - - + tools:context="com.lilystudio.wheretosleepinnju.course.CourseActivity"> @@ -17,7 +17,7 @@ android:alpha="0.8" android:scaleType="centerCrop" /> - - - - + tools:context="com.lilystudio.wheretosleepinnju.mg.MgActivity"> diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index a0bd19a..6599e2c 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.idealclover.wheretosleepinnju.setting.SettingActivity"> + tools:context="com.lilystudio.wheretosleepinnju.setting.SettingActivity"> @@ -24,7 +24,7 @@ android:text="@string/edit_class_schedule" /> - - - - - - - - - - - - - - - - - + app:summary="@string/app_LTS" /> - - - - - - - - - - - - 南哪课表 - 0.2.0 + 0.2.1 + 0.2.1 (LTS) 1455169173 FKX00710CQCHIHK4B9CA31 + 1736b669d7 手动添加 导入南京大学课表 @@ -64,7 +66,7 @@ https://github.com/idealclover/NJU-Class-Shedule-Android/blob/master/README.md 傻翠的个人博客（欢迎来玩） - https://www.idealclover.top + https://idealclover.top 检查更新 更新成功 diff --git a/app/src/main/res/xml/page_setting.xml b/app/src/main/res/xml/page_setting.xml index e8cd75c..0cc699c 100644 --- a/app/src/main/res/xml/page_setting.xml +++ b/app/src/main/res/xml/page_setting.xml @@ -68,7 +68,7 @@ diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml new file mode 100644 index 0000000..1b4e495 --- /dev/null +++ b/app/src/main/res/xml/provider_paths.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/idealclover/wheretosleepinnju/ExampleUnitTest.java b/app/src/test/java/com/lilystudio/wheretosleepinnju/ExampleUnitTest.java similarity index 89% rename from app/src/test/java/com/idealclover/wheretosleepinnju/ExampleUnitTest.java rename to app/src/test/java/com/lilystudio/wheretosleepinnju/ExampleUnitTest.java index e2ea81b..6e71555 100644 --- a/app/src/test/java/com/idealclover/wheretosleepinnju/ExampleUnitTest.java +++ b/app/src/test/java/com/lilystudio/wheretosleepinnju/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.idealclover.wheretosleepinnju; +package com.lilystudio.wheretosleepinnju; import org.junit.Test; diff --git a/check.json b/check.json index 1342548..e20574a 100644 --- a/check.json +++ b/check.json @@ -1,6 +1,6 @@ { - "version": "3", - "code": "0.2.0", - "msg": "正式版终于发布啦", - "link": "https://www.pgyer.com/dLzA" + "version": "5", + "code": "0.2.1", + "msg": "有重大更新ww", + "link": "https://www.pgyer.com/2hQ5" } diff --git a/qwq.json b/qwq.json deleted file mode 100644 index c2d2eff..0000000 --- a/qwq.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "5", - "code": "0.2.1", - "msg": "嘿,子枨 生日快乐ww", - "link": "https://github.com/idealclover/NJU-Class-Shedule-Android/blob/master/README.md" -}