更新

app/build.gradle

@@ -12,14 +12,14 @@ kapt {
 }
 
 android {
-    compileSdkVersion build_versions.compile_sdk
+    compileSdkVersion 30
 
     defaultConfig {
-        /*multiDexEnabled true
+       /* multiDexEnabled true
         applicationId "com.mhq.smartorder"*/
 
-        minSdkVersion build_versions.min_sdk
-        targetSdkVersion build_versions.target_sdk
+        minSdkVersion 26
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0.0"
         vectorDrawables.useSupportLibrary = true
@@ -127,7 +127,7 @@ android {
     }
 
     //DomainObjectCollection集合
-   /* applicationVariants.all { variant ->
+  /*  applicationVariants.all { variant ->
         variant.outputs.each { output ->
             if (output.outputFile != null && output.outputFile.name.endsWith('.apk')
                     && 'release'.equals(variant.buildType.name)) {
@@ -193,55 +193,51 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //    api deps.support.multidex
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.google.android.gms:play-services-maps:16.1.0'
-    implementation 'com.android.support:appcompat-v7:23.4.0'
-    annotationProcessor deps.glide.compiler
-    annotationProcessor deps.butterknife.butterknife_compiler
-    annotationProcessor deps.alibaba.arouter_compiler
-    kapt deps.glide.compiler
-    kapt deps.butterknife.butterknife_compiler
-    kapt deps.alibaba.arouter_compiler
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
+    //annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
+    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
+    kapt 'com.github.bumptech.glide:compiler:4.7.1'
+    //kapt 'com.jakewharton:butterknife-compiler:8.4.0'
+    kapt 'com.alibaba:arouter-compiler:1.1.4'
     //kapt deps.alibaba.arouter_compiler
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api deps.support.app_compat
-    api deps.support.design
-    api deps.support.cardview
-    api deps.support.multidex
-    api deps.support.constraint_layout
-    api deps.rxjava2
-    api deps.rxAndroid
-    api deps.rxjavaAdapter
-    api deps.and_permission
-    api deps.rxpermissions
-    api deps.glide.runtime
-    api deps.glide.okhttp3
-    api deps.widgets.photoview
-    api deps.butterknife.butterknife
-    api deps.alibaba.arouter_api
-    api deps.alibaba.fastjson
-    api deps.alibaba.converter_fastjson
-    api deps.retrofit.runtime
-    api deps.facebook.stetho
-    api deps.facebook.stetho_okhttp3
-    annotationProcessor deps.glide.compiler
+    api 'com.android.support:appcompat-v7:+'
+    api 'com.android.support:design:+'
+    api 'com.android.support:cardview-v7:+'
+    api 'com.android.support:multidex:1.0.2'
+    api "com.android.support.constraint:constraint-layout:1.1.1"
+    api 'io.reactivex.rxjava2:rxjava:2.1.8'
+    api 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    api 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    api 'com.yanzhenjie:permission:2.0.0-rc12'
+    api 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
+    api 'com.github.bumptech.glide:glide:4.7.1'
+    api 'com.github.bumptech.glide:okhttp3-integration:4.7.1'
+    api 'com.github.chrisbanes.photoview:library:1.2.4'
+    //api 'com.jakewharton:butterknife:8.4.0'
+    api 'com.alibaba:arouter-api:1.3.1'
+    api "com.alibaba:fastjson:1.1.67.android"
+    api 'org.ligboy.retrofit2:converter-fastjson-android:2.1.0'
+    api 'com.squareup.retrofit2:retrofit:2.3.0'
+    api 'com.facebook.stetho:stetho:1.5.0'
+    api "com.facebook.stetho:stetho-okhttp3:1.5.0"
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
     //annotationProcessor deps.butterknife.butterknife_compiler
-    annotationProcessor deps.alibaba.arouter_compiler
-    kapt deps.glide.compiler
+    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
+    kapt 'com.github.bumptech.glide:compiler:4.7.1'
     //kapt deps.butterknife.butterknife_compiler
-    kapt deps.alibaba.arouter_compiler
-    //mta 3.4.7 稳定版
-    //mid jar包 必须添加
-    api deps.tencent.mta
-    api deps.tencent.mid
+    kapt 'com.alibaba:arouter-compiler:1.1.4'
+    api 'com.qq.mta:mta:3.4.7-release'
+    api 'com.tencent.mid:mid:4.06-release'
     //    api project(':component-easeui')
-    api deps.tencent.wechat_opensdk
+    api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
     implementation 'org.aspectj:aspectjrt:1.8.9'
     implementation files('libs/happy-dns-0.2.13.jar')
     implementation files('libs/qiniu-android-sdk-7.3.12.jar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation deps.kotlin.anko
-    kapt deps.alibaba.arouter_compiler
+    implementation 'org.jetbrains.anko:anko:0.10.5'
+    kapt 'com.alibaba:arouter-compiler:1.1.4'
     api 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.46'
     api 'com.contrarywind:Android-PickerView:4.1.8'
     api 'com.hyman:flowlayout-lib:1.1.2'

app/src/main/AndroidManifest.xml

@@ -22,10 +22,9 @@
         tools:ignore="ProtectedPermissions" />
 
     <application
-        android:name="cn.dankal.basiclib.DankalApplication"
+        android:name="cn.dankal.basiclib.ModooApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:networkSecurityConfig="@xml/mta_network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
@@ -265,11 +264,11 @@
         <activity
             android:name="cn.dankal.user.login.LanguageSelectActivity"
             android:screenOrientation="portrait">
-            <intent-filter>
+           <!-- <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            </intent-filter>-->
         </activity>
         <activity
             android:name="com.mhq.smartorder.wxapi.WXPayEntryActivity"
@@ -339,9 +338,9 @@
             android:screenOrientation="sensor" />
         <activity android:name="com.luck.picture.lib.PictureExternalPreviewActivity"
             android:screenOrientation="portrait" />
-        <activity android:name="com.yalantis.ucrop.UCropActivity"
+        <activity android:name="com.uc.ucrop.UCropActivity"
             android:screenOrientation="portrait" />
-        <activity android:name="com.yalantis.ucrop.PictureMultiCuttingActivity"
+        <activity android:name="com.uc.ucrop.PictureMultiCuttingActivity"
             android:screenOrientation="portrait" />
         <activity android:name="com.luck.picture.lib.PicturePlayAudioActivity"
             android:screenOrientation="portrait" />

app/src/main/java/cn/dankal/basiclib/DKUserManager.java

@@ -14,7 +14,7 @@ import cn.dankal.basiclib.util.PreferenceUtil;
  */
 public class DKUserManager {
 
-    private static Context mContext = DankalApplication.getContext();
+    private static Context mContext = ModooApplication.getContext();
     private static SharedPreferences mSpUserInfo;
     private static SharedPreferences mSpToken;
     private static final String PreferenceUserInfo = "userinfo";

app/src/main/java/cn/dankal/basiclib/DankalApplication.java → app/src/main/java/cn/dankal/basiclib/ModooApplication.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.support.multidex.MultiDex;
 import android.support.v7.app.AppCompatDelegate;
-import android.text.TextUtils;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.facebook.stetho.Stetho;
@@ -14,7 +13,6 @@ import com.mhq.smartorder.wxapi.WxConstants;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.tencent.stat.MtaSDkException;
 import com.tencent.stat.StatConfig;
 import com.tencent.stat.StatService;
 
@@ -22,7 +20,6 @@ import org.litepal.LitePal;
 
 import java.util.Locale;
 
-import cn.dankal.basiclib.constant.Constant;
 import cn.dankal.basiclib.util.AppUtils;
 import cn.dankal.basiclib.util.DensityAdaptationUtils;
 import cn.dankal.basiclib.util.StringUtil;
@@ -36,16 +33,12 @@ import cn.dankal.basiclib.widget.loadsir.core.LoadSir;
 import cn.dankal.client.BuildConfig;
 
 
-/**
- * @author Dankal Android Developer
- * @since 2018/5/9
- */
 
-public class DankalApplication extends Application {
+public class ModooApplication extends Application {
     //개발 환경 인지 아 닌 지
     public static final boolean isDev = false;
 
-    private static DankalApplication context;
+    private static ModooApplication context;
 
     private static IWXAPI api;
 
@@ -142,7 +135,7 @@ public class DankalApplication extends Application {
     private static boolean login;
 
     public static void setLogin(boolean login) {
-        DankalApplication.login = login;
+        ModooApplication.login = login;
     }
 
     public static boolean isLogin() {

app/src/main/java/cn/dankal/basiclib/api/BaseApi.java

@@ -7,10 +7,7 @@ import com.readystatesoftware.chuck.ChuckInterceptor;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
-
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.domain.HttpLoggingInterceptor;
 import cn.dankal.basiclib.domain.TokenInterceptor;
 import cn.dankal.client.BuildConfig;
@@ -19,8 +16,6 @@ import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.fastjson.FastJsonConverterFactory;
 
-import static cn.dankal.basiclib.DankalApplication.isDev;
-
 /**
  * @author vane
  * @since 2018/3/24
@@ -88,7 +83,7 @@ public class BaseApi {
                     .addInterceptor(httpLoggingInterceptor)
                     .addInterceptor(new TokenInterceptor())
                     .addNetworkInterceptor(new StethoInterceptor())
-                    .addInterceptor(new ChuckInterceptor(DankalApplication.getContext()))
+                    .addInterceptor(new ChuckInterceptor(ModooApplication.getContext()))
                     .build();
         } else {
             okHttpClient = new OkHttpClient.Builder().readTimeout(50000, TimeUnit.SECONDS)

app/src/main/java/cn/dankal/basiclib/base/activity/BaseActivity.java

@@ -2,8 +2,6 @@ package cn.dankal.basiclib.base.activity;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -28,9 +26,9 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.util.List;
 
-import butterknife.ButterKnife;
+
 import cn.dankal.basiclib.DKUserManager;
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.base.BaseView;
 import cn.dankal.basiclib.base.callback.DKCallBackBoolean;
 import cn.dankal.basiclib.constant.ConstantsHomeType;
@@ -38,7 +36,6 @@ import cn.dankal.basiclib.util.ActivityManager;
 import cn.dankal.basiclib.util.ActivityUtils;
 import cn.dankal.basiclib.util.DKHandler;
 import cn.dankal.basiclib.util.SPUtils;
-import cn.dankal.basiclib.util.StatusBarHelper;
 import cn.dankal.basiclib.util.TitleBarUtils;
 import cn.dankal.basiclib.util.ToastUtils;
 import cn.dankal.basiclib.util.language.MultiLanguage;
@@ -81,7 +78,7 @@ public abstract class BaseActivity extends AppCompatActivity implements BaseView
         super.onCreate(savedInstanceState);
         ARouter.getInstance().inject(this);
         mRxPermissions = new RxPermissions(this);
-        if (DankalApplication.isDarkMode()){
+        if (ModooApplication.isDarkMode()){
             StatusBarUtil.setColorNoTranslucent(this, Color.parseColor("#00000000"));
         }else {
             StatusBarUtil.setColorNoTranslucent(this, Color.parseColor("#ffffffff"));
@@ -91,7 +88,7 @@ public abstract class BaseActivity extends AppCompatActivity implements BaseView
             setContentView(getLayoutId());
 
 
-            ButterKnife.bind(this);
+
 
             initStatusBar();
 
@@ -122,9 +119,9 @@ public abstract class BaseActivity extends AppCompatActivity implements BaseView
 
         String provider = judgeProvider(lm);
         if (provider != null) {
-            if (ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_FINE_LOCATION)
+            if (ActivityCompat.checkSelfPermission(ModooApplication.getContext(), Manifest.permission.ACCESS_FINE_LOCATION)
                     != PackageManager.PERMISSION_GRANTED
-                    && ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_COARSE_LOCATION)
+                    && ActivityCompat.checkSelfPermission(ModooApplication.getContext(), Manifest.permission.ACCESS_COARSE_LOCATION)
                     != PackageManager.PERMISSION_GRANTED) {
                 return null;
             } else {

app/src/main/java/cn/dankal/basiclib/base/activity/BaseListActivity.java

@@ -15,7 +15,7 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.ButterKnife;
+
 import cn.dankal.client.R;
 
 public abstract class BaseListActivity<T> extends BaseActivity implements OnRefreshLoadMoreListener {
@@ -58,7 +58,7 @@ public abstract class BaseListActivity<T> extends BaseActivity implements OnRefr
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.bind(this);
+
     }
 
 

app/src/main/java/cn/dankal/basiclib/base/activity/BaseWebviewActivity.java

@@ -6,7 +6,7 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import butterknife.BindView;
+
 import cn.dankal.basiclib.util.StringUtil;
 import cn.dankal.basiclib.util.ToastUtils;
 import cn.dankal.basiclib.util.WebViewUtil;

app/src/main/java/cn/dankal/basiclib/base/activity/BigPhotoActivity.java

 package cn.dankal.basiclib.base.activity;
 
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.Nullable;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.SparseArray;
@@ -15,26 +12,14 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
-import com.bumptech.glide.request.target.Target;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import cn.dankal.basiclib.DankalApplication;
-import cn.dankal.basiclib.GlideApp;
-import cn.dankal.basiclib.GlideRequest;
+
 import cn.dankal.basiclib.util.TitleBarUtils;
-import cn.dankal.basiclib.util.image.GlideTransform;
 import cn.dankal.basiclib.util.image.PicUtils;
 import cn.dankal.client.R;
 import uk.co.senab.photoview.PhotoViewAttacher;
 
-import static cn.dankal.basiclib.util.image.PicUtils.DEFAULT_AVATAR_ERRORHOLDER_RESID;
-import static cn.dankal.basiclib.util.image.PicUtils.DEFAULT_AVATAR_PLACEHOLDER_RESID;
-
 
 public class BigPhotoActivity extends BaseActivity {
 
@@ -61,7 +46,7 @@ public class BigPhotoActivity extends BaseActivity {
     @Override
     protected void initComponents() {
         initView();
-        ButterKnife.bind(this);
+
         TitleBarUtils.compat(this, getResources().getColor(R.color.color00));
         hasJump = true;
 

app/src/main/java/cn/dankal/basiclib/base/fragment/BaseFragment.java

@@ -17,8 +17,8 @@ import android.view.WindowManager;
 
 import com.tbruyelle.rxpermissions2.RxPermissions;
 
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
+
+
 import cn.dankal.basiclib.DKUserManager;
 import cn.dankal.client.R;
 import cn.dankal.basiclib.base.BaseView;
@@ -46,7 +46,7 @@ public abstract class BaseFragment extends Fragment implements BaseView {
 
     protected View mContentView;
     protected TipDialog loadingDialog;
-    protected Unbinder unbinder;
+    //protected Unbinder unbinder;
     protected CommonDialog commonDialog;
 
     private CompositeDisposable mDisposables = new CompositeDisposable();
@@ -58,7 +58,7 @@ public abstract class BaseFragment extends Fragment implements BaseView {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
         mContentView = inflater.inflate(getLayoutId(), container, false);
-        unbinder = ButterKnife.bind(this, mContentView);
+        //unbinder = ButterKnife.bind(this, mContentView);
         return mContentView;
     }
 
@@ -137,7 +137,7 @@ public abstract class BaseFragment extends Fragment implements BaseView {
     public void onDestroyView() {
         super.onDestroyView();
         if (mDisposables != null) mDisposables.clear();
-        if (unbinder != null) unbinder.unbind();
+        //if (unbinder != null) unbinder.unbind();
     }
 
     @Override

app/src/main/java/cn/dankal/basiclib/base/recyclerview/BaseRecyclerViewHolder.java

@@ -6,7 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import butterknife.ButterKnife;
+
 
 public abstract class BaseRecyclerViewHolder<T> extends RecyclerView.ViewHolder {
 
@@ -15,7 +15,7 @@ public abstract class BaseRecyclerViewHolder<T> extends RecyclerView.ViewHolder
 
     public BaseRecyclerViewHolder(View itemView) {
         super(itemView);
-        ButterKnife.bind(this, itemView);
+        //ButterKnife.bind(this, itemView);
     }
 
     public BaseRecyclerViewHolder(Context context, ViewGroup viewGroup, int layoutResId) {
@@ -30,7 +30,7 @@ public abstract class BaseRecyclerViewHolder<T> extends RecyclerView.ViewHolder
 
     public BaseRecyclerViewHolder(View itemView, int viewType) {
         super(itemView);
-        ButterKnife.bind(this, itemView);
+        //ButterKnife.bind(this, itemView);
         this.viewType = viewType;
     }
 

app/src/main/java/cn/dankal/basiclib/common/sms/SmsCodeImpl.java

@@ -7,19 +7,17 @@ import android.widget.Button;
 import java.util.concurrent.TimeUnit;
 
 import cn.dankal.basiclib.api.UserServiceFactory;
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.client.R;
 import cn.dankal.basiclib.base.BaseView;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
 import cn.dankal.basiclib.util.ActivityManager;
-import cn.dankal.basiclib.util.AppUtils;
 import cn.dankal.basiclib.util.StringUtil;
 import cn.dankal.basiclib.util.ToastUtils;
 import cn.dankal.entities.user.CodeEntity;
 import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import okhttp3.ResponseBody;
 
 /**
  * Date: 2018/8/1.
@@ -73,7 +71,7 @@ public class SmsCodeImpl implements SmsCode {
     @Override
     public void getEmailCode(String email, Button mBtCode) {
         if (!StringUtil.checkEmail(email)) {
-            ToastUtils.showShort(DankalApplication.getContext().getString(R.string.Please_enter_the_correct_format_mailbox));
+            ToastUtils.showShort(ModooApplication.getContext().getString(R.string.Please_enter_the_correct_format_mailbox));
             return;
         }
         UserServiceFactory.getSimpleEmail(email).subscribe(new AbstractDialogSubscriber<CodeEntity>(baseView) {
@@ -95,7 +93,7 @@ public class SmsCodeImpl implements SmsCode {
         if (activity != null) {
             context = activity;
         } else {
-            context = DankalApplication.getContext();
+            context = ModooApplication.getContext();
         }
         //倒计时
         Context finalContext = context;
@@ -127,7 +125,7 @@ public class SmsCodeImpl implements SmsCode {
             mDisposable = flowable.subscribe();
             //按钮可点击
             mBtCode.setEnabled(true);
-            mBtCode.setText(DankalApplication.getContext().getString(R.string.get_the_authentication_code));
+            mBtCode.setText(ModooApplication.getContext().getString(R.string.get_the_authentication_code));
         }
     }
 

app/src/main/java/cn/dankal/basiclib/cos/CosUploadUtil.java

@@ -17,16 +17,13 @@ import com.tencent.cos.xml.transfer.TransferManager;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
-import java.util.Map;
 
 import cn.dankal.basiclib.api.UserServiceFactory;
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.base.BaseView;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
 import cn.dankal.basiclib.util.HnUploadListImageControl;
-import cn.dankal.basiclib.util.ToastUtils;
 import cn.dankal.entities.user.UserCosTokenEntity;
-import io.reactivex.disposables.Disposable;
 
 /**
  * Created by zhengpeng on 2019/6/4.
@@ -89,7 +86,7 @@ public class CosUploadUtil {
         mListener = listener;
         MyCredentialProvider credentialProvider = new MyCredentialProvider(mUserCosTokenEntity);
 
-        CosXmlService cosXmlService = new CosXmlService(DankalApplication.getContext(), serviceConfig, credentialProvider);
+        CosXmlService cosXmlService = new CosXmlService(ModooApplication.getContext(), serviceConfig, credentialProvider);
 
         TransferConfig transferConfig = new TransferConfig.Builder().build();
 

app/src/main/java/cn/dankal/basiclib/domain/TokenInterceptor.java

@@ -2,12 +2,9 @@ package cn.dankal.basiclib.domain;
 
 
 import java.io.IOException;
-import java.util.Locale;
 
 import cn.dankal.basiclib.DKUserManager;
-import cn.dankal.basiclib.DankalApplication;
-import cn.dankal.basiclib.constant.Constant;
-import cn.dankal.basiclib.util.SPUtils;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.util.language.SPUtil;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -21,7 +18,7 @@ public class TokenInterceptor implements Interceptor {
     @Override
     public Response intercept(Chain chain) throws IOException {
         String language = "ch";
-        switch (SPUtil.getInstance(DankalApplication.getContext()).getSelectLanguage()) {
+        switch (SPUtil.getInstance(ModooApplication.getContext()).getSelectLanguage()) {
             case 0:
                 language = "ch";
                 break;

app/src/main/java/cn/dankal/basiclib/rx/AbstractSubscriber.java

@@ -2,9 +2,7 @@ package cn.dankal.basiclib.rx;
 
 import android.util.Log;
 
-import com.alibaba.android.arouter.launcher.ARouter;
-
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.client.R;
 import cn.dankal.basiclib.base.BaseView;
 import cn.dankal.basiclib.domain.HttpStatusCode;
@@ -13,8 +11,6 @@ import cn.dankal.basiclib.util.ActivityUtils;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 
-import static cn.dankal.basiclib.protocol.LoginProtocol.LOGIN;
-
 /**
  * @author Dankal Android Developer
  * @since 2018/7/18
@@ -42,9 +38,9 @@ public abstract class AbstractSubscriber<T> implements Observer<T> {
             if (exception.getErrorCode() == HttpStatusCode.TOKEN_INVAILD ||
                     exception.getErrorCode() == HttpStatusCode.UNAUTHORIZED) {
                 view.tokenInvalid();
-                view.showToast(DankalApplication.getContext().getString(R.string.login_Invalid));
+                view.showToast(ModooApplication.getContext().getString(R.string.login_Invalid));
                 try {
-                    ActivityUtils.startActivity(Class.forName(DankalApplication.getContext().getString(R.string.login_activity_path)));
+                    ActivityUtils.startActivity(Class.forName(ModooApplication.getContext().getString(R.string.login_activity_path)));
                 } catch (ClassNotFoundException e1) {
                     e1.printStackTrace();
                 }

app/src/main/java/cn/dankal/basiclib/rx/NormalSubscriber.java

@@ -5,7 +5,7 @@ import android.util.Log;
 //import com.hyphenate.chat.EMClient;
 
 import cn.dankal.basiclib.DKUserManager;
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.client.R;
 import cn.dankal.basiclib.domain.HttpStatusCode;
 import cn.dankal.basiclib.exception.LocalException;
@@ -31,7 +31,7 @@ public abstract class NormalSubscriber<T> implements Observer<T> {
                 DKUserManager.resetUserInfo();
                 ActivityUtils.finishAllActivities();
                 try {
-                    ActivityUtils.startActivity(Class.forName(DankalApplication.getContext().getString(R.string.login_activity_path)));
+                    ActivityUtils.startActivity(Class.forName(ModooApplication.getContext().getString(R.string.login_activity_path)));
                 } catch (ClassNotFoundException e1) {
                     e1.printStackTrace();
                 }

app/src/main/java/cn/dankal/basiclib/util/DisplayHelper.java

@@ -21,7 +21,7 @@ import android.view.WindowManager;
 import java.lang.reflect.Field;
 import java.util.Locale;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 /**
  * @author vane
@@ -170,7 +170,7 @@ public class DisplayHelper {
     }*/
 
     public static int sp2px( float spValue) {
-        final float fontScale = DankalApplication.getContext().getResources().getDisplayMetrics().scaledDensity;
+        final float fontScale = ModooApplication.getContext().getResources().getDisplayMetrics().scaledDensity;
         return (int) (spValue * fontScale + 0.5f);
     }
 

app/src/main/java/cn/dankal/basiclib/util/FileUtil.java

@@ -21,7 +21,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 
 /**
@@ -40,7 +40,7 @@ public class FileUtil {
     public static String readAssetsFile(String path) {
         String str = null;
         try {
-            InputStream is = DankalApplication.getContext().getAssets().open(path);
+            InputStream is = ModooApplication.getContext().getAssets().open(path);
             int size = is.available();
             byte[] buffer = new byte[size];
             is.read(buffer);
@@ -136,12 +136,12 @@ public class FileUtil {
     public static void refreshDCIM() {
         if (Build.VERSION.SDK_INT >= 19) {
             //兼容android4.4版本，只扫描存放照片的目录
-            MediaScannerConnection.scanFile(DankalApplication.getContext(),
+            MediaScannerConnection.scanFile(ModooApplication.getContext(),
                     new String[]{Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getPath()},
                     null, null);
         } else {
             //扫描整个SD卡来更新系统图库，当文件很多时用户体验不佳，且不适合4.4以上版本
-            DankalApplication.getContext().sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.parse("file://" +
+            ModooApplication.getContext().sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.parse("file://" +
                     Environment.getExternalStorageDirectory())));
         }
     }

app/src/main/java/cn/dankal/basiclib/util/FileUtils.java

@@ -29,7 +29,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 
 /**
@@ -51,7 +51,7 @@ public class FileUtils {
 
 
     public static final String FILES_DIR = SDCARD_DIR + "/" + "Android/data/" +
-            DankalApplication.getContext().getPackageName() + "/files/";
+            ModooApplication.getContext().getPackageName() + "/files/";
 
     /**
      * 默认本地上传图片目录

app/src/main/java/cn/dankal/basiclib/util/KeyBoardUtil.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 /**
  * Created by zhengpeng on 2019/6/19.
@@ -14,7 +14,7 @@ public class KeyBoardUtil {
      * 关闭软键盘
      */
     public static void  closeKeybord(EditText mEditText) {
-        InputMethodManager imm = (InputMethodManager) DankalApplication.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager) ModooApplication.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.hideSoftInputFromWindow(mEditText.getWindowToken(), 0);
     }
 }

app/src/main/java/cn/dankal/basiclib/util/LanguageUtil.java

@@ -13,7 +13,6 @@ import android.util.Log;
 
 import java.util.Locale;
 
-import cn.dankal.basiclib.DankalApplication;
 import cn.dankal.basiclib.constant.LanguageType;
 
 public class LanguageUtil {

app/src/main/java/cn/dankal/basiclib/util/SPUtils.java

@@ -7,7 +7,7 @@ import java.util.Map;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 /**
  * Created by zhengpeng on 2019/5/15.
@@ -27,7 +27,7 @@ public class SPUtils {
      */
     public static void put(String key, Object object) {
 
-        SharedPreferences sp = DankalApplication.getContext().getSharedPreferences(FILE_NAME,
+        SharedPreferences sp = ModooApplication.getContext().getSharedPreferences(FILE_NAME,
                 Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
 
@@ -56,7 +56,7 @@ public class SPUtils {
      * @return
      */
     public static Object get(String key, Object defaultObject) {
-        SharedPreferences sp = DankalApplication.getContext().getSharedPreferences(FILE_NAME,
+        SharedPreferences sp = ModooApplication.getContext().getSharedPreferences(FILE_NAME,
                 Context.MODE_PRIVATE);
 
         if (defaultObject instanceof String) {

app/src/main/java/cn/dankal/basiclib/util/SpannableStringUtils.java

@@ -31,7 +31,7 @@ import android.text.style.TypefaceSpan;
 import android.text.style.URLSpan;
 import android.text.style.UnderlineSpan;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 import static android.graphics.BlurMaskFilter.Blur;
 
@@ -512,7 +512,7 @@ public class SpannableStringUtils {
             }
             if (imageIsBitmap || imageIsDrawable || imageIsUri || imageIsResourceId) {
                 if (imageIsBitmap) {
-                    mBuilder.setSpan(new ImageSpan(DankalApplication.getContext(), bitmap), start, end, flag);
+                    mBuilder.setSpan(new ImageSpan(ModooApplication.getContext(), bitmap), start, end, flag);
                     bitmap = null;
                     imageIsBitmap = false;
                 } else if (imageIsDrawable) {
@@ -520,11 +520,11 @@ public class SpannableStringUtils {
                     drawable = null;
                     imageIsDrawable = false;
                 } else if (imageIsUri) {
-                    mBuilder.setSpan(new ImageSpan(DankalApplication.getContext(), uri), start, end, flag);
+                    mBuilder.setSpan(new ImageSpan(ModooApplication.getContext(), uri), start, end, flag);
                     uri = null;
                     imageIsUri = false;
                 } else {
-                    mBuilder.setSpan(new ImageSpan(DankalApplication.getContext(), resourceId), start, end, flag);
+                    mBuilder.setSpan(new ImageSpan(ModooApplication.getContext(), resourceId), start, end, flag);
                     resourceId = 0;
                     imageIsResourceId = false;
                 }

app/src/main/java/cn/dankal/basiclib/util/StringUtil.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 import static android.text.Html.FROM_HTML_MODE_LEGACY;
 
@@ -196,7 +196,7 @@ public class StringUtil {
     }
 
     public static Spanned fromHtml(int stringResource) {
-        Spanned htmlSpan = Html.fromHtml(DankalApplication.getContext().getString(stringResource));
+        Spanned htmlSpan = Html.fromHtml(ModooApplication.getContext().getString(stringResource));
         return htmlSpan;
     }
 

app/src/main/java/cn/dankal/basiclib/util/UIUtils.java

@@ -8,14 +8,14 @@ import android.net.Uri;
 
 import java.util.List;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 /**
  * Created by zhengpeng on 2019/6/6.
  */
 public class UIUtils {
     public static int px2dip(int px) {
-        final float scale = DankalApplication.getContext().getResources().getDisplayMetrics().density;
+        final float scale = ModooApplication.getContext().getResources().getDisplayMetrics().density;
         return (int) (px / scale + 0.5f);
     }
 
@@ -33,7 +33,7 @@ public class UIUtils {
     public static void call(String phone) {
         Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + phone));
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        DankalApplication.getContext().startActivity(intent);
+        ModooApplication.getContext().startActivity(intent);
     }
 
     public static boolean isWeixinAvilible(Context context) {

app/src/main/java/cn/dankal/basiclib/util/image/JSONUtils.java

@@ -8,7 +8,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 
 /**
  * Created by zhengpeng on 2019/6/4.
@@ -21,7 +21,7 @@ public class JSONUtils {
     public static String readAssetsFile(String path) {
         String str = null;
         try {
-            InputStream is = DankalApplication.getContext().getAssets().open(path);
+            InputStream is = ModooApplication.getContext().getAssets().open(path);
             int size = is.available();
             byte[] buffer = new byte[size];
             is.read(buffer);

app/src/main/java/cn/dankal/basiclib/util/image/PicUtils.java

@@ -9,12 +9,9 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.RequestOptions;
-
 import java.io.File;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.GlideApp;
 import cn.dankal.basiclib.GlideRequest;
 import cn.dankal.client.R;
@@ -68,7 +65,7 @@ public class PicUtils {
      * 加载头像(默认占位图、边宽颜色)
      */
     public static void loadAvatar(String s, @NonNull ImageView iv) {
-        loadCirclePic(DankalApplication.getContext(), s, iv, DEFAULT_BORDER_WIDTH, DEFAULT_BORDER_COLOR,
+        loadCirclePic(ModooApplication.getContext(), s, iv, DEFAULT_BORDER_WIDTH, DEFAULT_BORDER_COLOR,
                 DEFAULT_AVATAR_PLACEHOLDER_RESID, DEFAULT_AVATAR_ERRORHOLDER_RESID);
     }
 

app/src/main/java/cn/dankal/basiclib/widget/ChoiceAddressDialog.java

@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.ButterKnife;
+
 import cn.dankal.client.R;
 import cn.dankal.basiclib.pojo.LocalAddressBean;
 import cn.dankal.basiclib.util.ToastUtils;
@@ -27,12 +27,7 @@ import cn.dankal.basiclib.widget.wheelview.OnWheelChangedListener;
 import cn.dankal.basiclib.widget.wheelview.WheelView;
 import cn.dankal.basiclib.widget.wheelview.adapters.ArrayWheelAdapter;
 
-/**
- * Class description : 地址选择器
- *
- * @author Vane
- * @since 17/10/24
- */
+
 
 public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListener, View.OnClickListener {
 
@@ -40,23 +35,23 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
     private WheelView mViewCity;
     private WheelView mViewDistrict;
 
-    //所有省
+
     protected String[] mProvinceDatas;
-    //所有市
+
     protected String[] mCityDatas;
-    //所有区
+
     protected String[] mAreaDatas;
 
-    //key - 省 value - 市
+
     protected Map<String, String[]> mCitisDatasMap = new HashMap<String, String[]>();
-    //key - 市 values - 区
+
     protected Map<String, String[]> mDistrictDatasMap = new HashMap<String, String[]>();
 
-    // 当前省的名称
+
     protected String mCurrentProviceName;
-    //当前市的名称
+
     protected String mCurrentCityName;
-    //当前区的名称
+
     protected String mCurrentDistrictName = "";
 
     private String laststr = "";
@@ -81,7 +76,7 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
         super.onCreate(savedInstanceState);
         View dialogView = LayoutInflater.from(mContext).inflate(R.layout.dialog_address, null);
 
-        ButterKnife.bind(this, dialogView);
+        //ButterKnife.bind(this, dialogView);
 
         configWindowStyle(dialogView);
         setUpViewsAndListener();
@@ -89,24 +84,20 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
         setContentView(dialogView);
     }
 
-    /**
-     * 设置Dialog样式
-     */
+
     private void configWindowStyle(View dialogView) {
-        //获得dialog的window窗口
-        Window window = this.getWindow();                //设置dialog在屏幕底部
-        window.setGravity(Gravity.BOTTOM);                //设置dialog弹出时的动画效果，从屏幕底部向上弹出
+
+        Window window = this.getWindow();
+        window.setGravity(Gravity.BOTTOM);
         window.getDecorView().setPadding(0, 0, 0, 0);
-        WindowManager.LayoutParams lp = window.getAttributes();                 //获得window窗口的属性
-        lp.width = WindowManager.LayoutParams.MATCH_PARENT;                //设置窗口宽度为充满全屏
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;               //设置窗口高度为包裹内容
-        window.setAttributes(lp); //将设置好的属性set回去
+        WindowManager.LayoutParams lp = window.getAttributes();
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        window.setAttributes(lp);
         setContentView(dialogView);
     }
 
-    /**
-     * 注册监听
-     */
+
     private void setUpViewsAndListener() {
         mViewProvince = (WheelView) findViewById(R.id.wv_province);
         mViewCity = (WheelView) findViewById(R.id.wv_city);
@@ -120,16 +111,14 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
         mViewDistrict.addChangingListener(this);
     }
 
-    /**
-     * 解析省市区数据
-     */
+
     protected void parseProvinceDatas(final String defaultProvice, final String defaultCity, final String defaultArea) {
         try {
             laststr = readAssetsFile("city_data.txt");
             final List<LocalAddressBean> provinceList = JSON.parseArray(laststr, LocalAddressBean.class);
             showData(provinceList, defaultProvice, defaultCity, defaultArea);
         } catch (Exception e) {
-            ToastUtils.showShort("地址解析失败");
+
             e.printStackTrace();
         }
     }
@@ -141,44 +130,44 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
             return;
         }
 
-        //当遍历完省市区后用于显示带入地址
+
         int defProIndex = -1;
         int defCityIndex = -1;
         int defDistIndex = -1;
 
 
-        // 初始化默认选中的省、市、区
-        mCurrentProviceName = provinceList.get(0).text;//默认省名
+
+        mCurrentProviceName = provinceList.get(0).text;
         List<LocalAddressBean.AddressCity> firstCity = provinceList.get(0).children;
         if (firstCity != null && !firstCity.isEmpty()) {
-            mCurrentCityName = firstCity.get(0).text;//默认市名
+            mCurrentCityName = firstCity.get(0).text;
             List<LocalAddressBean.AddressCity.AddressArea> firstArea = firstCity.get(0).children;
             if (firstArea != null && !firstArea.isEmpty()) {
-                mCurrentDistrictName = firstArea.get(0).text;//默认区名
+                mCurrentDistrictName = firstArea.get(0).text;
             }
         }
 
-        //String[] 省
+
         mProvinceDatas = new String[provinceList.size()];
         for (int i = 0; i < provinceList.size(); i++) {
-            // 遍历所有省的数据
+
             mProvinceDatas[i] = provinceList.get(i).text;
             if (defaultProvice != null && defaultProvice.equals(provinceList.get(i).text)) {
                 defProIndex = i;
             }
 
-            //String[] 市
+
             List<LocalAddressBean.AddressCity> cityList = provinceList.get(i).children;
             mCityDatas = new String[cityList.size()];
             for (int j = 0; j < cityList.size(); j++) {
-                // 遍历省下面的所有市的数据
+
                 mCityDatas[j] = cityList.get(j).text;
                 if (defaultCity != null && defaultProvice != null && defaultCity.equals(cityList.get(j).text) &&
                         defaultProvice.equals(provinceList.get(i).text)) {
                     defCityIndex = j;
                 }
 
-                //String[] 区
+
                 List<LocalAddressBean.AddressCity.AddressArea> districtList = cityList.get(j).children;
                 mAreaDatas = new String[districtList != null ? districtList.size() : 1];
                 if (districtList != null) {
@@ -195,24 +184,21 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
                 } else {
                     mAreaDatas[0] = "";
                 }
-                // 市-区/县的数据，保存到mDistrictDatasMap
+
                 mDistrictDatasMap.put(mCityDatas[j], mAreaDatas);
             }
-            // 省-市的数据，保存到mCitisDatasMap
+
             mCitisDatasMap.put(provinceList.get(i).text, mCityDatas);
         }
 
-        // 设置可见条目数量
+
         mViewProvince.setVisibleItems(7);
         mViewCity.setVisibleItems(7);
         mViewDistrict.setVisibleItems(7);
 
         mViewProvince.setViewAdapter(new ArrayWheelAdapter<>(mContext, mProvinceDatas));
 
-        /**
-         * 如果有地址带入，则带入地址
-         * 没有则默认第一个
-         */
+
         mViewProvince.setCurrentItem(defProIndex != -1 ? defProIndex : 0);
         mCurrentProviceName = mProvinceDatas[defaultProvice != null ? defProIndex : 0];
         String[] cities = mCitisDatasMap.get(mCurrentProviceName);
@@ -229,9 +215,7 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
         mCurrentDistrictName = (mDistrictDatasMap.get(mCurrentCityName))[defDistIndex != -1 ? defDistIndex : 0];
     }
 
-    /**
-     * 根据当前的市，更新区WheelView的信息
-     */
+
     private void updateAreas() {
         try {
             int pCurrent = mViewCity.getCurrentItem();
@@ -251,9 +235,7 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
         }
     }
 
-    /**
-     * 根据当前的省，更新市WheelView的信息
-     */
+
     private void updateCities() {
         try {
             int pCurrent = mViewProvince.getCurrentItem();
@@ -271,9 +253,7 @@ public class ChoiceAddressDialog extends Dialog implements OnWheelChangedListene
 
     }
 
-    /**
-     * 将Assets文件转化为字符串
-     */
+
     public String readAssetsFile(String path) {
         String str = null;
         try {

app/src/main/java/cn/dankal/basiclib/widget/banner/DkBanner.java

@@ -49,7 +49,7 @@ public class DkBanner<T> extends FrameLayout {
     private final int DEFAULT_LOOP_TIME = 3000;
 
     // 节约时间  可以轮播的情况  一律视为无限轮播
-    private boolean isInfinite;
+    private boolean isInfinite=true;
     private int loopTime;
     private ViewPager mVp;
     private VpAdapter<T> mVpAdapter;
@@ -93,7 +93,7 @@ public class DkBanner<T> extends FrameLayout {
     private void initialize(Context c, AttributeSet a, int d) {
         TypedArray arrs = c.obtainStyledAttributes(a, R.styleable.DkBannerView, d, 0);
 
-        isInfinite = arrs.getBoolean(R.styleable.DkBannerView_is_infinite, DEFAULT_CAN_LOOP);
+        //isInfinite = arrs.getBoolean(R.styleable.DkBannerView_is_infinite, DEFAULT_CAN_LOOP);
         loopTime = arrs.getInt(R.styleable.DkBannerView_loop_time, DEFAULT_LOOP_TIME);
         select = arrs.getResourceId(R.styleable.DkBannerView_select_point, DEFAULT_SELECT);
         noraml = arrs.getResourceId(R.styleable.DkBannerView_noraml_point, DEFAULT_NORAML);

app/src/main/java/cn/dankal/basiclib/widget/banner/DkBannerTow.java

@@ -45,7 +45,7 @@ public class DkBannerTow<T> extends FrameLayout {
     private final int DEFAULT_LOOP_TIME = 3000;
 
     // 节约时间  可以轮播的情况  一律视为无限轮播
-    private boolean isInfinite;
+    private boolean isInfinite=true;
     private int loopTime;
     private ViewPager mVp;
     private VpAdapter<T> mVpAdapter;
@@ -96,7 +96,7 @@ public class DkBannerTow<T> extends FrameLayout {
     private void initialize(Context c, AttributeSet a, int d) {
         TypedArray arrs = c.obtainStyledAttributes(a, R.styleable.DkBannerView, d, 0);
 
-        isInfinite = arrs.getBoolean(R.styleable.DkBannerView_is_infinite, DEFAULT_CAN_LOOP);
+        //isInfinite = arrs.getBoolean(R.styleable.DkBannerView_is_infinite, DEFAULT_CAN_LOOP);
         loopTime = arrs.getInt(R.styleable.DkBannerView_loop_time, DEFAULT_LOOP_TIME);
         select = arrs.getResourceId(R.styleable.DkBannerView_select_point, DEFAULT_SELECT);
         noraml = arrs.getResourceId(R.styleable.DkBannerView_noraml_point, DEFAULT_NORAML);

app/src/main/java/cn/dankal/client/MainActivity.kt

@@ -43,7 +43,7 @@ import com.yanzhenjie.permission.Permission
 import com.yzq.zxinglibrary.common.Constant
 import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_main_sdk.*
 import okhttp3.ResponseBody
 import java.lang.reflect.Field
 
@@ -79,7 +79,7 @@ class MainActivity : BaseActivity(), OnMapReadyCallback {
 
             window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
         }
-        return R.layout.activity_main
+        return R.layout.activity_main_sdk
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -323,7 +323,7 @@ class MainActivity : BaseActivity(), OnMapReadyCallback {
                         return@OnCompleteListener
                     }
                     val token = task.result?.token
-                    Log.i("FirebaseInstanceId", token)
+                    //Log.i("FirebaseInstanceId", token)
 
                     //서버 에 업로드 하 다
                     var map = HashMap<String, Any?>()

app/src/main/java/cn/dankal/client/adapter/HomeAdapter.java

@@ -21,8 +21,8 @@ import com.flyco.tablayout.SlidingTabLayout;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
+
+
 import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter;
 import cn.dankal.basiclib.util.AppUtils;
 import cn.dankal.basiclib.util.DisplayHelper;

app/src/main/java/cn/dankal/client/adapter/shop/GridImageAdapter.java

@@ -26,7 +26,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.client.R;
 
 /**
@@ -118,7 +118,7 @@ public class GridImageAdapter extends
     public void onBindViewHolder(final ViewHolder viewHolder, final int position) {
         //8 장 미 만, 추가 아이콘 보이 기
         if (getItemViewType(position) == TYPE_CAMERA) {
-            if (DankalApplication.isDarkMode()){
+            if (ModooApplication.isDarkMode()){
                 viewHolder.mImg.setImageResource(R.mipmap.ic_evaluation_increase);
             }else {
                 viewHolder.mImg.setImageResource(R.mipmap.ic_evaluation_increase_s);

app/src/main/java/cn/dankal/client/adapter/shop/ShopTypeTitleAdapter.java

@@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 
 import java.util.List;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.entities.home.RestaurantDetailEntity;
 import cn.dankal.client.R;
 
@@ -35,14 +35,14 @@ public class ShopTypeTitleAdapter extends BaseQuickAdapter<RestaurantDetailEntit
         LinearLayoutCompat linearLayoutCompat = helper.getView(R.id.ll_item_title);
         if (sparseBooleanArray.get(helper.getAdapterPosition())) {
             helper.setVisible(R.id.tv_item_title_tag, true);
-            if (DankalApplication.isDarkMode()){
+            if (ModooApplication.isDarkMode()){
                 linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.color_191919));
             }else {
                 linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.white));
             }
         } else {
             helper.setVisible(R.id.tv_item_title_tag, false);
-            if (DankalApplication.isDarkMode()) {
+            if (ModooApplication.isDarkMode()) {
                 linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.color_ff2f2f2f));
             }else {
                 linearLayoutCompat.setBackgroundColor(context.getResources().getColor(R.color.btn_bg_tow));

app/src/main/java/cn/dankal/client/ui/home/FoodAllEvaluateActivity.kt

@@ -3,7 +3,7 @@ package cn.dankal.client.ui.home
 import android.support.v4.content.ContextCompat
 import android.support.v7.widget.LinearLayoutManager
 import android.view.View
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.RestaurantServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
@@ -108,7 +108,7 @@ class FoodAllEvaluateActivity : BaseActivity(), OnRefreshLoadMoreListener, View.
             R.id.tv_new_order -> {
                 mParams.remove("star_level_sort")
                 mParams.put("create_time_sort", "desc")
-                if (DankalApplication.isDarkMode()) {
+                if (ModooApplication.isDarkMode()) {
 
                     tv_new_order.setTextColor(ContextCompat.getColor(this, R.color.color_fbbc39))
                     tv_grade_order.setTextColor(ContextCompat.getColor(this, R.color.color_a6a6a6))
@@ -121,7 +121,7 @@ class FoodAllEvaluateActivity : BaseActivity(), OnRefreshLoadMoreListener, View.
             R.id.tv_grade_order -> {
                 mParams.remove("create_time_sort")
                 mParams.put("star_level_sort", "desc")
-                if (DankalApplication.isDarkMode()) {
+                if (ModooApplication.isDarkMode()) {
                     tv_grade_order.setTextColor(ContextCompat.getColor(this, R.color.color_fbbc39))
                     tv_new_order.setTextColor(ContextCompat.getColor(this, R.color.color_a6a6a6))
                 } else {

app/src/main/java/cn/dankal/client/ui/home/HomeActivity.kt

@@ -7,38 +7,25 @@ import android.content.pm.PackageManager
 import android.location.Location
 import android.location.LocationManager
 import android.os.Build
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.support.constraint.ConstraintLayout
 import android.support.v4.app.ActivityCompat
 import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutCompat
 import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.HomeServiceFactory
 import cn.dankal.basiclib.api.RestaurantServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter
-import cn.dankal.basiclib.constant.Constant
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
-import cn.dankal.basiclib.util.AppUtils
-import cn.dankal.basiclib.util.DisplayHelper
 import cn.dankal.basiclib.util.SPUtils
 import cn.dankal.basiclib.util.ToastUtils
-import cn.dankal.basiclib.widget.banner.DkBannerTow
-import cn.dankal.basiclib.widget.banner.IViewHolder
-import cn.dankal.basiclib.widget.banner.VH
 import cn.dankal.client.R
 import cn.dankal.client.constants.ConstantsHomeType
-import cn.dankal.client.constants.ConstantsShopType
-import cn.dankal.client.ui.home.details.DishesDetailsTowActivity
-import cn.dankal.client.ui.home.holder.BannerItemView
 import cn.dankal.client.ui.home.map.GoogleMapsActivity
-import cn.dankal.client.ui.shop.ShopDetailActivity
-import cn.dankal.client.ui.shop.WebViewContentActivity
 import cn.dankal.entities.event.LocationChangeEvent
 import cn.dankal.entities.home.TopHomeInfoEntity
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
@@ -51,7 +38,6 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import cn.dankal.basiclib.protocol.MainProtocol
 import cn.dankal.client.ui.home.details.MerchantDetailsActivity
-import cn.dankal.client.ui.personal.order.food.FoodOrderActivity
 import cn.dankal.entities.home.QRCodeEntity
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.google.gson.Gson
@@ -140,9 +126,9 @@ class HomeActivity : BaseActivity(), View.OnClickListener {
             var provider = judgeProvider(it)
             //위치 제공 기 가 있 는 경우
             if (provider != null) {
-                if (ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_FINE_LOCATION)
+                if (ActivityCompat.checkSelfPermission(ModooApplication.getContext(), Manifest.permission.ACCESS_FINE_LOCATION)
                         != PackageManager.PERMISSION_GRANTED
-                        && ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_COARSE_LOCATION)
+                        && ActivityCompat.checkSelfPermission(ModooApplication.getContext(), Manifest.permission.ACCESS_COARSE_LOCATION)
                         != PackageManager.PERMISSION_GRANTED) {
                     return null
                 }

app/src/main/java/cn/dankal/client/ui/home/HomeFragment.kt

@@ -14,7 +14,7 @@ import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutCompat
 import android.view.View
 import android.view.ViewGroup
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.HomeServiceFactory
 import cn.dankal.basiclib.base.fragment.BaseFragment
 import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter
@@ -146,9 +146,9 @@ class HomeFragment : BaseFragment(), View.OnClickListener {
             var provider = judgeProvider(it)
             //위치 제공 기 가 있 는 경우
             if (provider != null) {
-                if (ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_FINE_LOCATION)
+                if (ActivityCompat.checkSelfPermission(ModooApplication.getContext(), Manifest.permission.ACCESS_FINE_LOCATION)
                         != PackageManager.PERMISSION_GRANTED
-                        && ActivityCompat.checkSelfPermission(DankalApplication.getContext(), Manifest.permission.ACCESS_COARSE_LOCATION)
+                        && ActivityCompat.checkSelfPermission(ModooApplication.getContext(), Manifest.permission.ACCESS_COARSE_LOCATION)
                         != PackageManager.PERMISSION_GRANTED) {
                     return null
                 }

app/src/main/java/cn/dankal/client/ui/home/MenuItemFragment.java

@@ -4,7 +4,6 @@ package cn.dankal.client.ui.home;
 import android.Manifest;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
-import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutCompat;
@@ -15,7 +14,6 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -36,15 +34,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import butterknife.BindView;
-import butterknife.OnClick;
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.api.HomeServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
 import cn.dankal.basiclib.util.SPUtils;
 import cn.dankal.basiclib.widget.MyPopupWindow;
-import cn.dankal.client.util.ToastUtils;
 import cn.dankal.entities.event.LocationChangeEvent;
 import cn.dankal.entities.home.BottomAroundEntity;
 import cn.dankal.entities.home.RestaurantEntity;
@@ -57,7 +52,6 @@ import cn.dankal.client.ui.home.details.RecommendMerchantActivity;
 import cn.dankal.client.ui.home.map.GoogleMapsActivity;
 import cn.dankal.client.util.UIUtile;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 
 
 public class MenuItemFragment extends BaseFragment {
@@ -312,7 +306,7 @@ public class MenuItemFragment extends BaseFragment {
         TagAdapter adapterOne = new TagAdapter(listOne) {
             @Override
             public View getView(FlowLayout parent, int position, Object o) {
-                TextView tv = (TextView) LayoutInflater.from(DankalApplication.getContext()).inflate(R.layout.item_dialog_select, flowLayoutOne, false);
+                TextView tv = (TextView) LayoutInflater.from(ModooApplication.getContext()).inflate(R.layout.item_dialog_select, flowLayoutOne, false);
                 tv.setText(String.valueOf(o));
                 return tv;
             }
@@ -336,7 +330,7 @@ public class MenuItemFragment extends BaseFragment {
         TagAdapter adapterTow = new TagAdapter(listTow) {
             @Override
             public View getView(FlowLayout parent, int position, Object o) {
-                TextView tv = (TextView) LayoutInflater.from(DankalApplication.getContext()).inflate(R.layout.item_dialog_select, flowLayoutOne, false);
+                TextView tv = (TextView) LayoutInflater.from(ModooApplication.getContext()).inflate(R.layout.item_dialog_select, flowLayoutOne, false);
                 tv.setText(String.valueOf(o));
                 return tv;
             }

app/src/main/java/cn/dankal/client/ui/home/SearchShopActivity.java

@@ -29,9 +29,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
+
+
 import cn.dankal.basiclib.api.HomeServiceFactory;
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
@@ -248,7 +248,7 @@ public class SearchShopActivity extends BaseActivity implements OnRefreshLoadMor
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
+
     }
 
     /**

app/src/main/java/cn/dankal/client/ui/home/details/DetailsShopFragment.java

@@ -44,8 +44,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.BindView;
-import butterknife.OnClick;
+
+
 import cn.dankal.basiclib.api.RestaurantServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;

app/src/main/java/cn/dankal/client/ui/home/details/DishesDetailsActivity.kt

@@ -138,21 +138,21 @@ class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
     override fun initComponents() {
         addSingleTitleBar(getString(R.string.details_of_dishes))
         EventBus.getDefault().register(this)
-        hotelUuid = intent.getStringExtra("hotelUuid")
-        goodsUuid = intent.getStringExtra("goodsUuid")
-        tableUUID = intent.getStringExtra("tableUUID")
-        tableName = intent.getStringExtra("tableName")
+        hotelUuid = intent.getStringExtra("hotelUuid")?:""
+        goodsUuid = intent.getStringExtra("goodsUuid")?:""
+        tableUUID = intent.getStringExtra("tableUUID")?:""
+        tableName = intent.getStringExtra("tableName")?:""
         isStamp = intent.getIntExtra("is_stamp", 0)
 
         userStampNumber = intent.getIntExtra(MerchantDetailsActivity.USER_STAMP_COUNT, 0);
 
-        commitQueueEntity = intent.extras.getSerializable("entity") as CommitQueueEntity?
+        commitQueueEntity = intent.extras!!.getSerializable("entity") as CommitQueueEntity?
         commitQueueEntity?.let {
             queueUuid = it.uuid
         }
-        dataBean = intent.extras.getSerializable("contentEntity") as ShopTypeContentEntity.DataBean?
+        dataBean = intent.extras!!.getSerializable("contentEntity") as ShopTypeContentEntity.DataBean?
 
-        isUserCoupon = intent.extras.getBoolean(MerchantDetailsActivity.USER_COUPON)
+        isUserCoupon = intent.extras!!.getBoolean(MerchantDetailsActivity.USER_COUPON)
 
         mDkBanner = findViewById(R.id.banner)
 

app/src/main/java/cn/dankal/client/ui/home/details/DishesDetailsTowActivity.kt

@@ -187,8 +187,8 @@ class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesVie
         dishesPresenter?.attachView(this)
         mDkBanner = findViewById(R.id.banner)
 
-        hotelUuid = intent.getStringExtra(Constant.HOTEL_UUID)
-        goodsUuid = intent.getStringExtra(Constant.SHOP_UUID)
+        hotelUuid = intent.getStringExtra(Constant.HOTEL_UUID)?:""
+        goodsUuid = intent.getStringExtra(Constant.SHOP_UUID)?:""
 
         tv_select_spec.setOnClickListener(this)
         iv_menu_picture.setOnClickListener(this)

app/src/main/java/cn/dankal/client/ui/home/details/MerchantDetailsActivity.java

@@ -30,9 +30,9 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
+
+
 import cn.dankal.basiclib.api.RestaurantServiceFactory;
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter;
@@ -410,7 +410,7 @@ public class MerchantDetailsActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.bind(this);
+
         EventBus.getDefault().register(this);
     }
 

app/src/main/java/cn/dankal/client/ui/home/details/MerchantMallFragment.java

@@ -20,9 +20,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
+
+
+
 import cn.dankal.basiclib.api.MallServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
@@ -46,7 +46,7 @@ public class MerchantMallFragment extends BaseFragment implements OnRefreshLoadM
     RecyclerView rvDetailsContent;
 
     SmartRefreshLayout refreshLayout;
-    Unbinder unbinder;
+    //Unbinder unbinder;
 
     private String storeUuid = "";
     private MallTypeTitleAdapter shopTypeTitleAdapter;
@@ -198,14 +198,14 @@ public class MerchantMallFragment extends BaseFragment implements OnRefreshLoadM
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
+        //unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        unbinder.unbind();
+        //unbinder.unbind();
     }
 
     @Override

app/src/main/java/cn/dankal/client/ui/home/details/OrderResultActivity.kt

@@ -11,7 +11,6 @@ import android.text.TextWatcher
 import android.view.*
 import android.widget.*
 import cn.dankal.basiclib.api.RestaurantServiceFactory
-import cn.dankal.basiclib.DankalApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.constant.ConstantsHomeType
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
@@ -27,8 +26,6 @@ import cn.dankal.client.ui.home.ScanResultActivity
 import cn.dankal.client.util.UIUtile
 import cn.dankal.entities.event.ShopCarRefreshEvent
 import com.google.gson.Gson
-import com.mhq.smartorder.wxapi.WxConstants
-import com.tencent.mm.opensdk.modelpay.PayReq
 import com.yzq.zxinglibrary.android.CaptureActivity
 import com.yzq.zxinglibrary.common.Constant
 import io.reactivex.disposables.Disposable
@@ -177,7 +174,7 @@ class OrderResultActivity : BaseActivity(), View.OnClickListener {
 
         var bundle = intent.extras
 
-        queueUuid = bundle.getString(MerchantDetailsActivity.QUEUE_UUID, "")
+        queueUuid = bundle!!.getString(MerchantDetailsActivity.QUEUE_UUID, "")
         storeUUID = bundle.getString(MerchantDetailsActivity.HOTELUUID, "")
         isUserCoupon = bundle.getBoolean(MerchantDetailsActivity.USER_COUPON)
         tableUUID = bundle.getString(MerchantDetailsActivity.TABLE_UUID, "")
@@ -331,7 +328,7 @@ class OrderResultActivity : BaseActivity(), View.OnClickListener {
             3 -> {//쿠폰 을 선택 하고 돌아 가기
                 //쿠폰 ID 받 기
                 if (data != null) {
-                    var couponId = data.getStringExtra("couponUUID")
+                    var couponId = data.getStringExtra("couponUUID")?:""
                     var couponName = data.getStringExtra("couponName")
                     if (!TextUtils.isEmpty(couponName)) {
                         tv_coupon_name.text = couponName

app/src/main/java/cn/dankal/client/ui/home/details/ResultPageActivity.kt

@@ -49,7 +49,7 @@ class ResultPageActivity : BaseActivity(), View.OnClickListener {
 
         var bundle = intent.extras
 
-        orderId = bundle.getString("order_id")
+        orderId = bundle!!.getString("order_id")
         stampNumber = bundle.getInt("stampNumber")
         foodEntity = bundle.getSerializable("food_list") as CommitHotelEntity?
 

app/src/main/java/cn/dankal/client/ui/home/details/ResultPageTowActivity.kt

@@ -48,7 +48,7 @@ class ResultPageTowActivity : BaseActivity(),View.OnClickListener {
 
         var bundle = intent.extras
 
-        orderId = bundle.getString("order_id")
+        orderId = bundle!!.getString("order_id")
         stampNumber = bundle.getInt("stampNumber")
         foodEntity = bundle.getSerializable("food_list") as CommitHotelEntity?
 

app/src/main/java/cn/dankal/client/ui/home/details/SelectCouponActivity.kt

@@ -21,8 +21,8 @@ class SelectCouponActivity : BaseActivity() {
     override fun initComponents() {
         addSingleTitleBar(getString(R.string.choose_a_coupon))
 
-        useType = intent.getStringExtra("useType")
-        payment = intent.getStringExtra("payment")
+        useType = intent.getStringExtra("useType")?:""
+        payment = intent.getStringExtra("payment")?:""
 
         var dataList = ArrayList<Fragment>()
         dataList.add(SelectCouponFragment.newInstance("0", useType, payment))//可用

app/src/main/java/cn/dankal/client/ui/home/details/SelectPayFoodActivity.kt

 package cn.dankal.client.ui.home.details
 
-import android.content.Intent
 import android.view.View
-import cn.dankal.basiclib.api.RestaurantServiceFactory
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
-import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.client.R
 import cn.dankal.entities.car.PayParameterEntity
@@ -47,7 +44,7 @@ class SelectPayFoodActivity : BaseActivity(), View.OnClickListener {
         addSingleTitleBar(getString(R.string.select_payment_method))
 
         var bundle = intent.extras
-        payEntity = bundle.getSerializable("PayParameterEntity") as PayParameterEntity?
+        payEntity = bundle!!.getSerializable("PayParameterEntity") as PayParameterEntity?
         storeUUID = bundle.getString("storeUUID")
 
         ll_w_pay.setOnClickListener(this)
@@ -67,7 +64,7 @@ class SelectPayFoodActivity : BaseActivity(), View.OnClickListener {
             EventBus.getDefault().post(ShopCarRefreshEvent())
         }
 
-        val api = DankalApplication.getIWXAPI()
+        val api = ModooApplication.getIWXAPI()
         val request = PayReq()
         request.appId = WxConstants.WX_APP_ID//appid
         request.partnerId = payEntity.partner_id//상점 번호

app/src/main/java/cn/dankal/client/ui/home/holder/BannerItemView.java

@@ -5,8 +5,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
+
+
 import cn.dankal.basiclib.util.image.PicUtils;
 import cn.dankal.basiclib.widget.banner.VH;
 import cn.dankal.client.R;

app/src/main/java/cn/dankal/client/ui/home/map/GoogleMapsActivity.java

@@ -40,8 +40,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
+
 import cn.dankal.basiclib.api.HomeServiceFactory;
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;

app/src/main/java/cn/dankal/client/ui/home/map/GoogleMapsMallActivity.java

@@ -35,8 +35,8 @@ import com.google.android.gms.maps.model.MarkerOptions;
 
 import java.util.List;
 
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
+
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.util.image.PicUtils;
 import cn.dankal.entities.home.BottomAroundEntity;

app/src/main/java/cn/dankal/client/ui/home/map/GoogleMapsMerchantActivity.java

@@ -36,8 +36,8 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
+
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.util.image.PicUtils;
 import cn.dankal.basiclib.widget.GradeStarView;

app/src/main/java/cn/dankal/client/ui/personal/LogoutActivity.kt

 package cn.dankal.client.ui.personal
 
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
-import cn.dankal.basiclib.constant.Constant
-import cn.dankal.basiclib.constant.LanguageType
 import cn.dankal.basiclib.protocol.LoginProtocol
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.basiclib.util.ActivityUtils
-import cn.dankal.basiclib.util.SPUtils
 import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.basiclib.util.WebViewUtil
 import cn.dankal.basiclib.util.language.SPUtil
@@ -50,7 +47,7 @@ class LogoutActivity : BaseActivity() {
                         DKUserManager.resetUserInfo()
                         ActivityUtils.finishAllActivities()
                         try {
-                            ActivityUtils.startActivity(Class.forName(DankalApplication.getContext().getString(R.string.login_activity_path)))
+                            ActivityUtils.startActivity(Class.forName(ModooApplication.getContext().getString(R.string.login_activity_path)))
                         } catch (e1: ClassNotFoundException) {
                             e1.printStackTrace()
                         }

app/src/main/java/cn/dankal/client/ui/personal/MyQueueFragment.java

@@ -11,9 +11,9 @@ import android.view.ViewGroup;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
+
+
+
 import cn.dankal.basiclib.api.UserServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
@@ -28,7 +28,7 @@ public class MyQueueFragment extends BaseFragment {
     private static final String ARG_PARAM1 = "param1";
 
     RecyclerView rvMyQueue;
-    Unbinder unbinder;
+    //Unbinder unbinder;
 
     private int mParam1;
 
@@ -95,13 +95,13 @@ public class MyQueueFragment extends BaseFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
+        //unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        unbinder.unbind();
+        //unbinder.unbind();
     }
 }

app/src/main/java/cn/dankal/client/ui/personal/PersonalInfoActivity.kt

@@ -6,7 +6,7 @@ import android.graphics.Bitmap
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
 import android.view.View
 import cn.dankal.basiclib.api.UserServiceFactory
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.GlideApp
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.cos.CosUploadUtil
@@ -196,7 +196,7 @@ class PersonalInfoActivity : BaseActivity(), View.OnClickListener {
         if (path == "") {
             return
         }
-        GlideApp.with(DankalApplication.getContext()).asBitmap().centerCrop().error(R.mipmap.pic_my_home_head).load(path).into(object : BitmapImageViewTarget(iv_personal_user_head) {
+        GlideApp.with(ModooApplication.getContext()).asBitmap().centerCrop().error(R.mipmap.pic_my_home_head).load(path).into(object : BitmapImageViewTarget(iv_personal_user_head) {
             override fun setResource(resource: Bitmap?) {
                 val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(resources, resource)
                 circularBitmapDrawable.isCircular = true

app/src/main/java/cn/dankal/client/ui/personal/QueueDetailsActivity.kt

@@ -7,14 +7,13 @@ import android.text.TextUtils
 import android.view.View
 import cn.dankal.basiclib.api.RestaurantServiceFactory
 import cn.dankal.basiclib.api.UserServiceFactory
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.base.callback.DKCallBackBoolean
 import cn.dankal.basiclib.constant.ConstantsHomeType
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.basiclib.util.ActivityManager
 import cn.dankal.basiclib.util.ToastUtils
-import cn.dankal.client.MainActivity
 import cn.dankal.client.R
 import cn.dankal.client.constants.ConstantsRestaurantType
 import cn.dankal.client.ui.home.HomeActivity
@@ -78,7 +77,7 @@ class QueueDetailsActivity : BaseActivity() {
                         ll_layout.visibility = View.GONE
                         //llBackGround.setBackgroundResource(R.mipmap.pic_home_queuing_bg_3);
                         iv_start_image.setImageResource(R.mipmap.ic_home_queuing)
-                        if (DankalApplication.isDarkMode()) {
+                        if (ModooApplication.isDarkMode()) {
                             val linearLayoutCompat = findViewById<LinearLayoutCompat>(R.id.ll_top_layout)
                             linearLayoutCompat.background = resources.getDrawable(R.mipmap.ic_line_background_pass)
                         } else {

app/src/main/java/cn/dankal/client/ui/personal/SettingActivity.kt

@@ -8,14 +8,12 @@ import android.view.*
 import android.widget.PopupWindow
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.constant.Constant
 import cn.dankal.basiclib.eventbus.UpdateLanguageEvent
 import cn.dankal.basiclib.widget.dialog.CallDialog
-import cn.dankal.client.MainActivity
 import cn.dankal.client.R
-import cn.dankal.basiclib.constant.LanguageType
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.basiclib.util.*
 import cn.dankal.basiclib.util.language.LocalManageUtil
@@ -24,7 +22,6 @@ import cn.dankal.basiclib.widget.dialog.SignOutDialog
 import cn.dankal.client.ui.home.HomeActivity
 import cn.dankal.client.ui.shop.AddressManagerActivity
 import cn.dankal.entities.personal.AboutDetailsEntity
-import cn.dankal.user.login.LoginActivity
 import kotlinx.android.synthetic.main.activity_setting.*
 import org.greenrobot.eventbus.EventBus
 
@@ -169,7 +166,7 @@ class SettingActivity : BaseActivity(), CallDialog.OnCenterItemClickListener, Vi
         //popupWindow.dismiss()
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            LanguageUtil.changeAppLanguage(DankalApplication.getContext(), language)
+            LanguageUtil.changeAppLanguage(ModooApplication.getContext(), language)
         }
         SPUtils.put(Constant.EVENT_REFRESH_LANGUAGE, language)
         val intent = Intent(this, HomeActivity::class.java)

app/src/main/java/cn/dankal/client/ui/personal/order/mall/AfterSaleInfoActivity.kt

@@ -123,7 +123,7 @@ class AfterSaleInfoActivity : BaseActivity(), View.OnClickListener {
 
         toastTipDialog = ToastTipDialog(this@AfterSaleInfoActivity, R.layout.item_layout_tip_cancel, intArrayOf())
 
-        afterSaleUuid = intent.getStringExtra("after_sale_uuid")
+        afterSaleUuid = intent.getStringExtra("after_sale_uuid")?:""
         requestData()
     }
 

app/src/main/java/cn/dankal/client/ui/personal/order/mall/ApplyAfterSaleActivity.kt

@@ -51,9 +51,9 @@ class ApplyAfterSaleActivity : BaseActivity(), View.OnClickListener {
         cl_only_one.setOnClickListener(this)
         cl_only_tow.setOnClickListener(this)
 
-        entity = intent.extras.getSerializable("shop") as MallOrderDetailEntity.OrdersGoodsListBean?
+        entity = intent.extras!!.getSerializable("shop") as MallOrderDetailEntity.OrdersGoodsListBean?
 
-        storeName = intent.extras.getString("store_name", "")
+        storeName = intent.extras!!.getString("store_name", "")
         tv_store_name.text = storeName
 
         entity?.let {

app/src/main/java/cn/dankal/client/ui/personal/order/mall/ApplyAfterSaleTowActivity.kt

@@ -220,7 +220,7 @@ class ApplyAfterSaleTowActivity : BaseActivity(), GridImageAdapter.onAddPicClick
 
     private fun initData() {
         var bundle = intent.extras
-        type = bundle.getInt("type")
+        type = bundle!!.getInt("type")
 
         if (type == 0) {//애프터서비스 를 제출 하 다.
             entity = bundle.getSerializable("shop") as MallOrderDetailEntity.OrdersGoodsListBean?

app/src/main/java/cn/dankal/client/ui/personal/order/mall/EvaluationActivity.kt

@@ -114,7 +114,7 @@ class EvaluationActivity : BaseActivity() {
         }
 
         var bundle = intent.extras
-        var entity: MallOrderDetailEntity = bundle.getSerializable("shop_list") as MallOrderDetailEntity
+        var entity: MallOrderDetailEntity = bundle!!.getSerializable("shop_list") as MallOrderDetailEntity
         entity?.let {
             orderId = it.uuid
             storeUuid = it.hotel_store_uuid

app/src/main/java/cn/dankal/client/ui/personal/order/mall/ExpressActivity.java

@@ -8,8 +8,8 @@ import android.widget.TextView;
 import java.util.HashMap;
 import java.util.Map;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
+
+
 import cn.dankal.basiclib.api.AddressServiceFactory;
 import cn.dankal.basiclib.api.BaseApi;
 import cn.dankal.basiclib.api.UserService;
@@ -113,6 +113,6 @@ public class ExpressActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.bind(this);
+
     }
 }

app/src/main/java/cn/dankal/client/ui/personal/order/mall/MallOrderDetailsPayActivity.kt

@@ -4,7 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.view.View
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.MallServiceFactory
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
@@ -182,7 +182,7 @@ class MallOrderDetailsPayActivity : BaseActivity(), View.OnClickListener, CallLi
 
     private fun payShop(payEntity: PayParameterEntity) {
 
-        val api = DankalApplication.getIWXAPI()
+        val api = ModooApplication.getIWXAPI()
 
         val request = PayReq()
 

app/src/main/java/cn/dankal/client/ui/personal/order/mall/MallOrderFragment.kt

@@ -5,7 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.view.View
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.MallServiceFactory
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.base.fragment.BaseFragment
@@ -269,7 +269,7 @@ class MallOrderFragment : BaseFragment(), OnRefreshLoadMoreListener, CallListDia
 
     private fun payShop(payEntity: PayParameterEntity) {
 
-        val api = DankalApplication.getIWXAPI()
+        val api = ModooApplication.getIWXAPI()
 
         val request = PayReq()
 

app/src/main/java/cn/dankal/client/ui/shop/AddAddressActivity.java

@@ -23,9 +23,9 @@ import java.util.List;
 import java.util.Map;
 
 import cn.dankal.basiclib.api.AddressServiceFactory;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
+
+
 import cn.dankal.basiclib.api.AddressService;
 import cn.dankal.basiclib.api.BaseApi;
 import cn.dankal.basiclib.base.activity.BaseActivity;
@@ -231,7 +231,7 @@ public class AddAddressActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.bind(this);
+
     }
 
     public void onViewClicked(View view) {

app/src/main/java/cn/dankal/client/ui/shop/CommentMallActivity.kt

@@ -4,8 +4,7 @@ import android.content.Intent
 import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.View
-import cn.dankal.basiclib.api.AddressServiceFactory
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.MallServiceFactory
 import cn.dankal.basiclib.base.activity.BaseListActivity
 import cn.dankal.basiclib.base.activity.BigPhotoActivity
@@ -96,7 +95,7 @@ class CommentMallActivity : BaseListActivity<CommentContentEntity.DataBean>() {
                 CommentTypeEntity(getString(R.string.figure), 5))
 
         rv_comment_type.layoutManager = GridLayoutManager(this, 3)
-        var commentTypeAdapter = CommentTypeAdapter(DankalApplication.getContext(), R.layout.item_comment_type, listType)
+        var commentTypeAdapter = CommentTypeAdapter(ModooApplication.getContext(), R.layout.item_comment_type, listType)
         rv_comment_type.adapter = commentTypeAdapter
 
         commentTypeAdapter.setOnItemClickListener { adapter, view, position ->

app/src/main/java/cn/dankal/client/ui/shop/DetailsMerchantFragment.java

@@ -21,9 +21,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
+
+
+
 import cn.dankal.basiclib.api.MallServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
@@ -46,7 +46,7 @@ public class DetailsMerchantFragment extends BaseFragment implements OnRefreshLo
     RecyclerView rvDetailsContent;
 
     SmartRefreshLayout refreshLayout;
-    Unbinder unbinder;
+    //Unbinder unbinder;
 
     private String storeUuid = "";
     public static final String TYPE_DATA = "type_data";
@@ -184,14 +184,14 @@ public class DetailsMerchantFragment extends BaseFragment implements OnRefreshLo
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
+        //unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        unbinder.unbind();
+        //unbinder.unbind();
     }
 
     @Override

app/src/main/java/cn/dankal/client/ui/shop/MallEvaluateDetailsActivity.kt

@@ -31,7 +31,7 @@ class MallEvaluateDetailsActivity : BaseListActivity<EvaluateEntity>() {
 
         addSingleTitleBar(getString(R.string.evaluate))
 
-        uuid = intent.getStringExtra(ConstantsShopType.GOODS_UUID)
+        uuid = intent.getStringExtra(ConstantsShopType.GOODS_UUID)?:""
         requestListData(true)
     }
 

app/src/main/java/cn/dankal/client/ui/shop/MallListActivity.kt

@@ -4,10 +4,8 @@ import android.content.Intent
 import android.graphics.Rect
 import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.RecyclerView
-import android.view.LayoutInflater
 import android.view.View
-import cn.dankal.basiclib.api.AddressServiceFactory
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.MallServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
@@ -17,7 +15,6 @@ import cn.dankal.entities.shop.ShopEntity
 import cn.dankal.client.R
 import cn.dankal.client.adapter.shop.ShopAdapter
 import cn.dankal.client.constants.ConstantsShopType
-import cn.dankal.client.util.UIUtile
 import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
@@ -104,7 +101,7 @@ class MallListActivity : BaseActivity(), OnRefreshLoadMoreListener {
         addSingleTitleBar(getString(R.string.merchandise_recommendation))
 
         emptyView = findViewById(R.id.include)
-        homeTypeUUid = intent.getStringExtra("homeTypeUUid")
+        homeTypeUUid = intent.getStringExtra("homeTypeUUid")?:""
 
         shopAdapter = ShopAdapter(R.layout.item_shop, listData)
         shopAdapter?.setOnItemClickListener { adapter, view, position ->
@@ -120,18 +117,18 @@ class MallListActivity : BaseActivity(), OnRefreshLoadMoreListener {
         val gridLayoutManager = GridLayoutManager(this, 2)
 
         val gridItemDecoration = object : RecyclerView.ItemDecoration() {
-            override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) {
+            override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
                 val layoutManager = parent.layoutManager as GridLayoutManager
                 val lp = view.layoutParams as GridLayoutManager.LayoutParams
                 val spanCount = layoutManager.spanCount
                 val layoutPosition = (view.layoutParams as RecyclerView.LayoutParams).viewLayoutPosition
                 if (lp.spanSize != spanCount) {
                     if (layoutPosition % 2 == 1) {
-                        outRect.left = Util.dp2px(DankalApplication.getContext(), 5)
-                        outRect.right = Util.dp2px(DankalApplication.getContext(), 5)
+                        outRect.left = Util.dp2px(ModooApplication.getContext(), 5)
+                        outRect.right = Util.dp2px(ModooApplication.getContext(), 5)
                     } else {
-                        outRect.left = Util.dp2px(DankalApplication.getContext(), 5)
-                        outRect.right = Util.dp2px(DankalApplication.getContext(), 5)
+                        outRect.left = Util.dp2px(ModooApplication.getContext(), 5)
+                        outRect.right = Util.dp2px(ModooApplication.getContext(), 5)
                     }
                 }
             }

app/src/main/java/cn/dankal/client/ui/shop/MallPayResultActivity.kt

@@ -7,8 +7,7 @@ import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
 import android.view.View
-import cn.dankal.basiclib.api.AddressServiceFactory
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.MallServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
@@ -16,7 +15,6 @@ import cn.dankal.basiclib.widget.passwordview.Util
 import cn.dankal.entities.personal.MallOrderDetailEntity
 import cn.dankal.entities.shop.RecommendShopEntity
 import cn.dankal.client.R
-import cn.dankal.client.MainActivity
 import cn.dankal.client.adapter.shop.ShopResultAdapter
 import cn.dankal.client.constants.ConstantsShopType
 import cn.dankal.client.ui.home.HomeActivity
@@ -75,7 +73,7 @@ class MallPayResultActivity : BaseActivity(), View.OnClickListener {
         tv_result_home.setOnClickListener(this)
 
         var bundle = intent.extras
-        var homeTypeUuid = bundle.getString("home_type_uuid", "")
+        var homeTypeUuid = bundle!!.getString("home_type_uuid", "")
         orderId = bundle.getString("orderId")
         type = bundle.getInt("type")
         mallOrderActivity = bundle.getSerializable("shop_list") as MallOrderDetailEntity?
@@ -107,18 +105,25 @@ class MallPayResultActivity : BaseActivity(), View.OnClickListener {
         }
         rv_result_recommend.layoutManager = GridLayoutManager(this, 2)
         val gridItemDecoration = object : RecyclerView.ItemDecoration() {
-            override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) {
+
+
+            override fun getItemOffsets(outRect: Rect, itemPosition: Int, parent: RecyclerView) {
+
+            }
+
+            override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+                //super.getItemOffsets(outRect, view, parent, state)
                 val layoutManager = parent.layoutManager as GridLayoutManager
                 val lp = view.layoutParams as GridLayoutManager.LayoutParams
                 val spanCount = layoutManager.spanCount
                 val layoutPosition = (view.layoutParams as RecyclerView.LayoutParams).viewLayoutPosition
                 if (lp.spanSize != spanCount) {
                     if (layoutPosition % 2 == 1) {
-                        outRect.left = Util.dp2px(DankalApplication.getContext(), 5)
-                        outRect.right = Util.dp2px(DankalApplication.getContext(), 5)
+                        outRect.left = Util.dp2px(ModooApplication.getContext(), 5)
+                        outRect.right = Util.dp2px(ModooApplication.getContext(), 5)
                     } else {
-                        outRect.left = Util.dp2px(DankalApplication.getContext(), 5)
-                        outRect.right = Util.dp2px(DankalApplication.getContext(), 5)
+                        outRect.left = Util.dp2px(ModooApplication.getContext(), 5)
+                        outRect.right = Util.dp2px(ModooApplication.getContext(), 5)
                     }
                 }
                 //outRect.top = divider;

app/src/main/java/cn/dankal/client/ui/shop/QueueActivity.java

@@ -11,9 +11,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.dankal.basiclib.api.RestaurantServiceFactory;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
+
+
 import cn.dankal.basiclib.base.BaseView;
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
@@ -92,7 +92,7 @@ public class QueueActivity extends BaseActivity implements TableListDialog.OnCen
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.bind(this);
+
     }
 
     public void onViewClicked(View view) {

app/src/main/java/cn/dankal/client/ui/shop/QueueResultActivity.java

@@ -17,10 +17,8 @@ import com.yzq.zxinglibrary.common.Constant;
 import org.greenrobot.eventbus.EventBus;
 
 import cn.dankal.basiclib.api.RestaurantServiceFactory;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import cn.dankal.basiclib.DankalApplication;
+
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.constant.ConstantsHomeType;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
@@ -30,7 +28,6 @@ import cn.dankal.client.ui.home.HomeActivity;
 import cn.dankal.entities.event.UpdateStateEvent;
 import cn.dankal.entities.home.CommitQueueEntity;
 import cn.dankal.entities.home.QRCodeEntity;
-import cn.dankal.client.MainActivity;
 import cn.dankal.client.R;
 import cn.dankal.client.constants.ConstantsRestaurantType;
 import cn.dankal.client.ui.home.ScanResultActivity;
@@ -128,7 +125,7 @@ public class QueueResultActivity extends BaseActivity {
                 tvYouQueue.setText(getString(R.string.please_queue_again));
                 llLayout.setVisibility(View.GONE);
                 ivStartImage.setImageResource(R.mipmap.ic_home_queuing);
-                if (DankalApplication.isDarkMode()) {
+                if (ModooApplication.isDarkMode()) {
                     LinearLayoutCompat linearLayoutCompat = findViewById(R.id.ll_top_layout);
                     linearLayoutCompat.setBackground(getResources().getDrawable(R.mipmap.ic_line_background_pass));
                 } else {
@@ -163,7 +160,7 @@ public class QueueResultActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.bind(this);
+
     }
 
 

app/src/main/java/cn/dankal/client/ui/shop/ShopDetailActivity.kt

@@ -11,9 +11,8 @@ import android.view.*
 import android.widget.ImageView
 import android.widget.PopupWindow
 import android.widget.TextView
-import cn.dankal.basiclib.api.AddressServiceFactory
 import cn.dankal.basiclib.api.UserServiceFactory
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.MallServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.base.activity.BigPhotoActivity
@@ -30,7 +29,6 @@ import cn.dankal.entities.shop.AddCarResultEntity
 import cn.dankal.entities.shop.CommentContentEntity
 import cn.dankal.entities.shop.MallSpecsDetailEntity
 import cn.dankal.entities.shop.ShopDetailEntity
-import cn.dankal.client.MainActivity
 import cn.dankal.client.R
 import cn.dankal.client.adapter.shop.CommentImageAdapter
 import cn.dankal.client.constants.ConstantsShopType
@@ -203,7 +201,7 @@ class ShopDetailActivity : BaseActivity(), View.OnClickListener {
                 DisplayHelper.dp2px(AppUtils.getApp(), 10), DisplayHelper.dp2px(AppUtils.getApp(), 10))
 
         val bundle = intent.extras
-        storeUuid = bundle.getString(ConstantsShopType.STORE_UUID)
+        storeUuid = bundle!!.getString(ConstantsShopType.STORE_UUID)
         goodsUuid = bundle.getString(ConstantsShopType.GOODS_UUID)
         inType = bundle.getInt(ConstantsShopType.MALL_TYPE, 1)
 
@@ -370,7 +368,7 @@ class ShopDetailActivity : BaseActivity(), View.OnClickListener {
 
         val adapter = object : TagAdapter<String>(list) {
             override fun getView(parent: FlowLayout?, position: Int, t: String?): View {
-                val tv = LayoutInflater.from(DankalApplication.getContext()).inflate(R.layout.item_dialog_format_tow, flowLayoutOne, false) as TextView
+                val tv = LayoutInflater.from(ModooApplication.getContext()).inflate(R.layout.item_dialog_format_tow, flowLayoutOne, false) as TextView
                 tv.text = t.toString()
                 return tv
             }

app/src/main/java/cn/dankal/client/ui/shop/ShopFragment.java

@@ -23,10 +23,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.dankal.basiclib.api.AddressServiceFactory;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
+
+
+
+
 import cn.dankal.basiclib.api.MallServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter;
@@ -40,7 +40,7 @@ public class ShopFragment extends BaseFragment {
 
     SlidingTabLayout slidingTabs;
     ViewPager vpShopPager;
-    Unbinder unbinder;
+    //Unbinder unbinder;
     TextView tvStateBar;
     SmartRefreshLayout refreshLayout;
     private List<Fragment> dataList;
@@ -143,13 +143,13 @@ public class ShopFragment extends BaseFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
+        //unbinder = ButterKnife.bind(this, rootView);
         return rootView;
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        unbinder.unbind();
+        //unbinder.unbind();
     }
 }

app/src/main/java/cn/dankal/client/ui/shop/ShopItemFragment.java

@@ -16,10 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import cn.dankal.basiclib.api.AddressServiceFactory;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.api.MallServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.constant.Constant;
@@ -36,7 +33,6 @@ import cn.dankal.client.R;
 import cn.dankal.client.adapter.shop.ShopAdapter;
 import cn.dankal.entities.shop.ShopEntity;
 import cn.dankal.client.constants.ConstantsShopType;
-import cn.dankal.client.ui.home.details.MerchantDetailsActivity;
 import io.reactivex.disposables.Disposable;
 
 public class ShopItemFragment extends BaseFragment {
@@ -127,11 +123,11 @@ public class ShopItemFragment extends BaseFragment {
                 int layoutPosition = ((RecyclerView.LayoutParams) view.getLayoutParams()).getViewLayoutPosition();
                 if (lp.getSpanSize() != spanCount) {
                     if (layoutPosition % 2 == 1) {
-                        outRect.left = Util.dp2px(DankalApplication.getContext(), 13);
-                        outRect.right = Util.dp2px(DankalApplication.getContext(), 5);
+                        outRect.left = Util.dp2px(ModooApplication.getContext(), 13);
+                        outRect.right = Util.dp2px(ModooApplication.getContext(), 5);
                     } else {
-                        outRect.left = Util.dp2px(DankalApplication.getContext(), 5);
-                        outRect.right = Util.dp2px(DankalApplication.getContext(), 13);
+                        outRect.left = Util.dp2px(ModooApplication.getContext(), 5);
+                        outRect.right = Util.dp2px(ModooApplication.getContext(), 13);
                     }
                 }
                 //outRect.top = divider;

app/src/main/java/cn/dankal/client/ui/shop/SureOrderActivity.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.text.TextUtils
 import android.view.View
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.api.AddressServiceFactory
 import cn.dankal.basiclib.api.MallServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
@@ -92,7 +92,7 @@ class SureOrderActivity : BaseActivity(), View.OnClickListener {
             }
             2 -> {//주소 반환
                 data?.let {
-                    var data: AddressEntity.DataBean = it.extras.getSerializable("address") as AddressEntity.DataBean
+                    var data: AddressEntity.DataBean = it.extras!!.getSerializable("address") as AddressEntity.DataBean
                     data?.let {
 
                         if (ll_no_address.visibility == View.VISIBLE) {
@@ -109,7 +109,7 @@ class SureOrderActivity : BaseActivity(), View.OnClickListener {
             }
             3 -> {//쿠폰 을 선택 하고 돌아 가기
                 if (data != null) {
-                    var couponId = data.getStringExtra("couponUUID")
+                    var couponId = data.getStringExtra("couponUUID")?:""
                     var couponName = data.getStringExtra("couponName")
                     if (!TextUtils.isEmpty(couponName)) {
                         tv_coupon_name.text = couponName
@@ -151,7 +151,7 @@ class SureOrderActivity : BaseActivity(), View.OnClickListener {
 
     private fun payShop(payEntity: PayParameterEntity) {
 
-        val api = DankalApplication.getIWXAPI()
+        val api = ModooApplication.getIWXAPI()
 
         val request = PayReq()
 
@@ -179,8 +179,8 @@ class SureOrderActivity : BaseActivity(), View.OnClickListener {
 
         EventBus.getDefault().register(this)
 
-        entity = intent.extras.get(ConstantsShopType.ORDER_ENTITY) as CartGoodsListEntity
-        homeTypeUuid = intent.extras.getString("home_type_uuid", "")
+        entity = intent.extras!!.get(ConstantsShopType.ORDER_ENTITY) as CartGoodsListEntity
+        homeTypeUuid = intent.extras!!.getString("home_type_uuid", "")
         rv_sure_order_list.layoutManager = LinearLayoutManager(this)
         sureOrderAdapter = SureOrderAdapter(R.layout.item_sure_order, listShopData)
         rv_sure_order_list.adapter = sureOrderAdapter

app/src/main/java/cn/dankal/client/util/ToastUtils.java

 package cn.dankal.client.util;
 
 import android.app.Activity;
-import android.content.Context;
 import android.widget.Toast;
 
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.util.ActivityManager;
-import cn.dankal.basiclib.util.AppUtils;
 
 /**
  * Created by zhengpeng on 2019/8/8.
@@ -15,14 +13,14 @@ import cn.dankal.basiclib.util.AppUtils;
 public class ToastUtils {
     public static void showShort(int text) {
         Activity activity = ActivityManager.getInstance().getLastActivity();
-        Toast sToast = Toast.makeText((activity == null) ? DankalApplication.getContext() : activity, null, Toast.LENGTH_SHORT);
+        Toast sToast = Toast.makeText((activity == null) ? ModooApplication.getContext() : activity, null, Toast.LENGTH_SHORT);
         sToast.setText(text);
         sToast.show();
     }
 
     public static void showShort(String text) {
         Activity activity = ActivityManager.getInstance().getLastActivity();
-        Toast sToast = Toast.makeText((activity == null) ? DankalApplication.getContext() : activity, null, Toast.LENGTH_SHORT);
+        Toast sToast = Toast.makeText((activity == null) ? ModooApplication.getContext() : activity, null, Toast.LENGTH_SHORT);
         sToast.setText(text);
         sToast.show();
     }

app/src/main/java/cn/dankal/client/util/UIUtile.java

@@ -20,11 +20,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import cn.dankal.basiclib.DankalApplication;
-import cn.dankal.basiclib.constant.Constant;
-import cn.dankal.basiclib.constant.LanguageType;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.util.ActivityManager;
-import cn.dankal.basiclib.util.SPUtils;
 import cn.dankal.basiclib.util.language.SPUtil;
 import cn.dankal.client.R;
 
@@ -149,7 +146,7 @@ public class UIUtile {
      */
     public static View getView(int layoutId, ViewGroup parent) {
         Activity activity = ActivityManager.getInstance().getLastActivity();
-        return LayoutInflater.from((activity == null) ? DankalApplication.getContext() : activity).inflate(layoutId, parent, false);
+        return LayoutInflater.from((activity == null) ? ModooApplication.getContext() : activity).inflate(layoutId, parent, false);
     }
 
     /**
@@ -208,7 +205,7 @@ public class UIUtile {
 
         try {
             String zhang = "장";
-            int languageType = SPUtil.getInstance(DankalApplication.getContext()).getSelectLanguage();
+            int languageType = SPUtil.getInstance(ModooApplication.getContext()).getSelectLanguage();
 
             if (languageType == 1) {
                 zhang = "장";
@@ -238,7 +235,7 @@ public class UIUtile {
     public static String stringToStamp(int s) {
         try {
             String zhang = "장";
-            int languageType = SPUtil.getInstance(DankalApplication.getContext()).getSelectLanguage();
+            int languageType = SPUtil.getInstance(ModooApplication.getContext()).getSelectLanguage();
             if (languageType == 1) {
                 zhang = "장";
             } else if (languageType == 0) {
@@ -253,7 +250,7 @@ public class UIUtile {
             e.printStackTrace();
             Log.e(TAG, "데이터 변환 오류");
         }
-        return DankalApplication.getContext().getString(R.string.zhang);
+        return ModooApplication.getContext().getString(R.string.zhang);
     }
 
     /**

app/src/main/java/cn/dankal/user/forget/ForgetPasswordHomeActivity.kt

 package cn.dankal.user.forget
 
-import android.content.Intent
 import android.graphics.Color
 import android.support.v4.content.ContextCompat
 import android.text.Editable
@@ -9,20 +8,15 @@ import android.text.TextWatcher
 import android.view.View
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.common.sms.SmsCodeImpl
-import cn.dankal.basiclib.constant.Constant
 import cn.dankal.basiclib.pojo.UserInfoBean
 import cn.dankal.basiclib.pojo.UserResponseBody
 import cn.dankal.basiclib.protocol.LoginProtocol
 import cn.dankal.basiclib.protocol.LoginProtocol.FORGET_PASSWORD
 import cn.dankal.basiclib.protocol.LoginProtocol.INPUT_NEW_PASSWORD
-import cn.dankal.basiclib.protocol.MainProtocol
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
-import cn.dankal.basiclib.util.ActivityManager
 import cn.dankal.basiclib.util.KeyBoardUtil
-import cn.dankal.basiclib.util.SPUtils
 import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.basiclib.util.image.JSONUtils
 import cn.dankal.basiclib.util.language.SPUtil

app/src/main/java/cn/dankal/user/login/FindEmailTowActivity.kt

@@ -3,7 +3,7 @@ package cn.dankal.user.login
 import android.text.TextUtils
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.pojo.UserInfoBean
 import cn.dankal.basiclib.pojo.UserResponseBody
@@ -57,7 +57,7 @@ class FindEmailTowActivity : BaseActivity() {
     private fun requestLogin(email: String) {
         UserServiceFactory.emailLogin(email).subscribe(object : AbstractDialogSubscriber<UserInfoBean>(this) {
             override fun onNext(userInfoBean: UserInfoBean) {
-                DankalApplication.setLogin(true)//设置账号已登录
+                ModooApplication.setLogin(true)//设置账号已登录
                 val userResponseBody = UserResponseBody()
                 val tokenBean = UserResponseBody.TokenBean()
                 tokenBean.token = userInfoBean.access_token

app/src/main/java/cn/dankal/user/login/LanguageSelectActivity.kt

 package cn.dankal.user.login
 
 import android.content.Intent
-import android.content.res.Configuration
-import android.content.res.Resources
-import android.os.Build
-import android.os.Bundle
-import android.os.UserManager
 import android.text.TextUtils
 import android.view.View
-import android.widget.PopupWindow
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.constant.Constant
-import cn.dankal.basiclib.constant.LanguageType
-import cn.dankal.basiclib.eventbus.UpdateLanguageEvent
 import cn.dankal.basiclib.protocol.LoginProtocol
 import cn.dankal.basiclib.protocol.MainProtocol
-import cn.dankal.basiclib.util.LanguageUtil
 import cn.dankal.basiclib.util.SPUtils
-import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.basiclib.util.language.LocalManageUtil
 import cn.dankal.client.R
 import com.alibaba.android.arouter.launcher.ARouter
 import kotlinx.android.synthetic.main.activity_language_select.*
-import org.greenrobot.eventbus.EventBus
-import java.util.*
 
 class LanguageSelectActivity : BaseActivity() {
 
@@ -39,7 +27,7 @@ class LanguageSelectActivity : BaseActivity() {
         if (SPUtils.get(Constant.FIRST_IN, true) as Boolean) {
             ll_select_bg.visibility = View.VISIBLE
         } else {
-            if (DankalApplication.isLogin()) {//로그 인 됨
+            if (ModooApplication.isLogin()) {//로그 인 됨
                 //정보의 초기 완성 여 부 를 판단 하 다.
                 if (TextUtils.isEmpty(DKUserManager.getUserInfo().phone)) {
                     ARouter.getInstance().build(LoginProtocol.LOGIN).navigation()

app/src/main/java/cn/dankal/user/login/LoginActivity.kt

@@ -9,7 +9,7 @@ import android.util.Log
 import android.view.KeyEvent
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.pojo.UserInfoBean
 import cn.dankal.basiclib.pojo.UserResponseBody
@@ -19,12 +19,11 @@ import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.basiclib.util.AppUtils
 import cn.dankal.basiclib.util.StringUtil
 import cn.dankal.basiclib.util.ToastUtils
-import cn.dankal.basiclib.util.UIUtils
 import cn.dankal.basiclib.widget.CommonDialog
 import cn.dankal.client.R
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
-import kotlinx.android.synthetic.main.activity_login.*
+import kotlinx.android.synthetic.main.activity_login_sdk.*
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.firebase.iid.FirebaseInstanceId
 import com.mhq.smartorder.wxapi.WXEntryActivity
@@ -34,7 +33,6 @@ import com.tencent.mm.opensdk.openapi.IWXAPI
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
 import com.yanzhenjie.permission.Permission
 import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
 import okhttp3.ResponseBody
 
 
@@ -54,7 +52,7 @@ class LoginActivity : BaseActivity() {
     private var iwxapi: IWXAPI? = null
 
     override fun getLayoutId(): Int {
-        return R.layout.activity_login
+        return R.layout.activity_login_sdk
     }
 
     private var mRxPermissions: RxPermissions? = null
@@ -201,7 +199,7 @@ class LoginActivity : BaseActivity() {
         UserServiceFactory.accountLogin(map).subscribe(object : AbstractDialogSubscriber<UserInfoBean>(this) {
             override fun onNext(userInfoBean: UserInfoBean) {
 
-                DankalApplication.setLogin(true)
+                ModooApplication.setLogin(true)
                 val userResponseBody = UserResponseBody()
                 val tokenBean = UserResponseBody.TokenBean()
                 tokenBean.token = userInfoBean.access_token
@@ -232,7 +230,7 @@ class LoginActivity : BaseActivity() {
                     // Get new Instance ID token
                     val token = task.result?.token
 
-                    Log.i("FirebaseInstanceId", token)
+                    //Log.i("FirebaseInstanceId", token)
 
                     //서버 에 업로드 하 다
                     var map = HashMap<String, Any?>()

app/src/main/java/cn/dankal/user/wx/IsBindPhoneActivity.kt

@@ -7,7 +7,7 @@ import android.text.TextWatcher
 import android.view.View
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.common.sms.SmsCodeImpl
 import cn.dankal.basiclib.constant.Constant
@@ -182,7 +182,7 @@ class IsBindPhoneActivity : BaseActivity(), View.OnClickListener {
                     map["type"] = 1
                     UserServiceFactory.accountBinding(map).subscribe(object : AbstractDialogSubscriber<UserInfoBean>(this@IsBindPhoneActivity) {
                         override fun onNext(userInfoBean: UserInfoBean) {
-                            DankalApplication.setLogin(true)//계 정 설정 이미 로그 인
+                            ModooApplication.setLogin(true)//계 정 설정 이미 로그 인
                             val userResponseBody = UserResponseBody()
                             val tokenBean = UserResponseBody.TokenBean()
                             tokenBean.token = userInfoBean.access_token

app/src/main/java/cn/dankal/user/wx/RegisterInputInfoWXActivity.kt

 package cn.dankal.user.wx
 
-import android.content.Intent
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
 import android.view.View
 import cn.dankal.basiclib.api.UserServiceFactory
 import cn.dankal.basiclib.DKUserManager
-import cn.dankal.basiclib.DankalApplication
+import cn.dankal.basiclib.ModooApplication
 import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.pojo.UserInfoBean
 import cn.dankal.basiclib.pojo.UserResponseBody
@@ -59,7 +58,7 @@ class RegisterInputInfoWXActivity : BaseActivity(), View.OnClickListener {
 
                 UserServiceFactory.wxRegisterUser(map).subscribe(object : AbstractDialogSubscriber<UserInfoBean>(this) {
                     override fun onNext(userInfoBean: UserInfoBean) {
-                        DankalApplication.setLogin(true)//设置账号已登录
+                        ModooApplication.setLogin(true)//设置账号已登录
                         val userResponseBody = UserResponseBody()
                         val tokenBean = UserResponseBody.TokenBean()
                         tokenBean.token = userInfoBean.access_token

app/src/main/java/com/luck/picture/lib/PictureBaseActivity.java

@@ -29,8 +29,8 @@ import com.luck.picture.lib.tools.AttrsUtils;
 import com.luck.picture.lib.tools.DateUtils;
 import com.luck.picture.lib.tools.DoubleUtils;
 import com.luck.picture.lib.tools.PictureFileUtils;
-import com.yalantis.ucrop.UCrop;
-import com.yalantis.ucrop.UCropMulti;
+import com.uc.ucrop.UCrop;
+import com.uc.ucrop.UCropMulti;
 
 import java.io.File;
 import java.util.ArrayList;

app/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java

@@ -24,12 +24,12 @@ import com.luck.picture.lib.rxbus2.Subscribe;
 import com.luck.picture.lib.rxbus2.ThreadMode;
 import com.luck.picture.lib.tools.ScreenUtils;
 import com.luck.picture.lib.tools.ToastManage;
-
-import com.yalantis.ucrop.UCrop;
-import com.yalantis.ucrop.UCropMulti;
-import com.yalantis.ucrop.model.CutInfo;
 import com.luck.picture.lib.tools.VoiceUtils;
 import com.luck.picture.lib.widget.PreviewViewPager;
+import com.uc.ucrop.UCrop;
+import com.uc.ucrop.UCropMulti;
+import com.uc.ucrop.model.CutInfo;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java

@@ -48,9 +48,9 @@ import com.luck.picture.lib.tools.StringUtils;
 import com.luck.picture.lib.tools.ToastManage;
 import com.luck.picture.lib.widget.FolderPopWindow;
 import com.luck.picture.lib.widget.PhotoPopupWindow;
-import com.yalantis.ucrop.UCrop;
-import com.yalantis.ucrop.UCropMulti;
-import com.yalantis.ucrop.model.CutInfo;
+import com.uc.ucrop.UCrop;
+import com.uc.ucrop.UCropMulti;
+import com.uc.ucrop.model.CutInfo;
 
 import java.io.File;
 import java.io.Serializable;

app/src/main/java/com/mhq/smartorder/wxapi/WXEntryActivity.java

@@ -15,7 +15,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import cn.dankal.basiclib.api.UserServiceFactory;
 import cn.dankal.basiclib.DKUserManager;
-import cn.dankal.basiclib.DankalApplication;
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.client.R;
 import cn.dankal.basiclib.base.activity.BaseActivity;
 import cn.dankal.basiclib.pojo.UserInfoBean;
@@ -75,7 +75,7 @@ public class WXEntryActivity extends BaseActivity implements IWXAPIEventHandler
                         UserServiceFactory.appRegister(code).subscribe(new AbstractDialogSubscriber<UserInfoBean>(this) {
                             @Override
                             public void onNext(UserInfoBean userInfoBean) {
-                                DankalApplication.setLogin(true);//设置账号已登录
+                                ModooApplication.setLogin(true);//设置账号已登录
                                 UserResponseBody userResponseBody = new UserResponseBody();
                                 UserResponseBody.TokenBean tokenBean = new UserResponseBody.TokenBean();
                                 tokenBean.token = userInfoBean.getAccess_token();

app/src/main/java/com/yalantis/ucrop/PictureMultiCuttingActivity.java → app/src/main/java/com/uc/ucrop/PictureMultiCuttingActivity.java

-package com.yalantis.ucrop;
+package com.uc.ucrop;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -36,18 +36,18 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.yalantis.ucrop.callback.BitmapCropCallback;
-import com.yalantis.ucrop.model.AspectRatio;
-import com.yalantis.ucrop.model.CutInfo;
-import com.yalantis.ucrop.util.FileUtils;
-import com.yalantis.ucrop.util.SelectedStateListDrawable;
-import com.yalantis.ucrop.view.CropImageView;
-import com.yalantis.ucrop.view.GestureCropImageView;
-import com.yalantis.ucrop.view.OverlayView;
-import com.yalantis.ucrop.view.TransformImageView;
-import com.yalantis.ucrop.view.UCropView;
-import com.yalantis.ucrop.view.widget.AspectRatioTextView;
-import com.yalantis.ucrop.view.widget.HorizontalProgressWheelView;
+import com.uc.ucrop.callback.BitmapCropCallback;
+import com.uc.ucrop.model.AspectRatio;
+import com.uc.ucrop.model.CutInfo;
+import com.uc.ucrop.util.FileUtils;
+import com.uc.ucrop.util.SelectedStateListDrawable;
+import com.uc.ucrop.view.CropImageView;
+import com.uc.ucrop.view.GestureCropImageView;
+import com.uc.ucrop.view.OverlayView;
+import com.uc.ucrop.view.TransformImageView;
+import com.uc.ucrop.view.UCropView;
+import com.uc.ucrop.view.widget.AspectRatioTextView;
+import com.uc.ucrop.view.widget.HorizontalProgressWheelView;
 
 import java.io.File;
 import java.io.Serializable;

app/src/main/java/com/yalantis/ucrop/PicturePhotoGalleryAdapter.java → app/src/main/java/com/uc/ucrop/PicturePhotoGalleryAdapter.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.yalantis.ucrop;
+package com.uc.ucrop;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -27,7 +27,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.request.RequestOptions;
-import com.yalantis.ucrop.model.CutInfo;
+import com.uc.ucrop.model.CutInfo;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/yalantis/ucrop/UCrop.java → app/src/main/java/com/uc/ucrop/UCrop.java

-package com.yalantis.ucrop;
+package com.uc.ucrop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -17,14 +17,12 @@ import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.yalantis.ucrop.model.AspectRatio;
+import com.uc.ucrop.model.AspectRatio;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Locale;
 
-import cn.dankal.client.BuildConfig;
-
 /**
  * Created by Oleksii Shliama (https://github.com/shliama).
  * <p/>
@@ -35,7 +33,7 @@ public class UCrop {
     public static final int REQUEST_CROP = 69;
     public static final int RESULT_ERROR = 96;
 
-    private static final String EXTRA_PREFIX = BuildConfig.APPLICATION_ID;
+    private static final String EXTRA_PREFIX = "110";
 
     public static final String EXTRA_INPUT_URI = EXTRA_PREFIX + ".InputUri";
     public static final String EXTRA_OUTPUT_URI = EXTRA_PREFIX + ".OutputUri";
@@ -215,7 +213,7 @@ public class UCrop {
      * @param intent crop result intent
      * @return aspect ratio as a floating point value (x:y) - so it will be 1 for 1:1 or 4/3 for 4:3
      */
-    public static float getOutputCropAspectRatio(@NonNull Intent intent) {
+    public static Parcelable getOutputCropAspectRatio(@NonNull Intent intent) {
         return intent.getParcelableExtra(EXTRA_OUTPUT_CROP_ASPECT_RATIO);
     }
 

app/src/main/java/com/yalantis/ucrop/UCropActivity.java → app/src/main/java/com/uc/ucrop/UCropActivity.java

-package com.yalantis.ucrop;
+package com.uc.ucrop;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -34,16 +34,16 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.yalantis.ucrop.callback.BitmapCropCallback;
-import com.yalantis.ucrop.model.AspectRatio;
-import com.yalantis.ucrop.util.SelectedStateListDrawable;
-import com.yalantis.ucrop.view.CropImageView;
-import com.yalantis.ucrop.view.GestureCropImageView;
-import com.yalantis.ucrop.view.OverlayView;
-import com.yalantis.ucrop.view.TransformImageView;
-import com.yalantis.ucrop.view.UCropView;
-import com.yalantis.ucrop.view.widget.AspectRatioTextView;
-import com.yalantis.ucrop.view.widget.HorizontalProgressWheelView;
+import com.uc.ucrop.callback.BitmapCropCallback;
+import com.uc.ucrop.model.AspectRatio;
+import com.uc.ucrop.util.SelectedStateListDrawable;
+import com.uc.ucrop.view.CropImageView;
+import com.uc.ucrop.view.GestureCropImageView;
+import com.uc.ucrop.view.OverlayView;
+import com.uc.ucrop.view.TransformImageView;
+import com.uc.ucrop.view.UCropView;
+import com.uc.ucrop.view.widget.AspectRatioTextView;
+import com.uc.ucrop.view.widget.HorizontalProgressWheelView;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/com/yalantis/ucrop/UCropMulti.java → app/src/main/java/com/uc/ucrop/UCropMulti.java

-package com.yalantis.ucrop;
+package com.uc.ucrop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -17,16 +17,14 @@ import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.yalantis.ucrop.model.AspectRatio;
-import com.yalantis.ucrop.model.CutInfo;
+import com.uc.ucrop.model.AspectRatio;
+import com.uc.ucrop.model.CutInfo;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import cn.dankal.client.BuildConfig;
-
 /**
  * Created by Oleksii Shliama (https://github.com/shliama).
  * <p/>
@@ -37,7 +35,7 @@ public class UCropMulti {
     public static final int REQUEST_MULTI_CROP = 609;
     public static final int RESULT_ERROR = 96;
 
-    private static final String EXTRA_PREFIX = BuildConfig.APPLICATION_ID;
+    private static final String EXTRA_PREFIX = "110";
 
     public static final String EXTRA_INPUT_URI = EXTRA_PREFIX + ".InputUri";
     public static final String EXTRA_OUTPUT_URI = EXTRA_PREFIX + ".OutputUri";
@@ -219,7 +217,7 @@ public class UCropMulti {
      * @param intent crop result intent
      * @return aspect ratio as a floating point value (x:y) - so it will be 1 for 1:1 or 4/3 for 4:3
      */
-    public static float getOutputCropAspectRatio(@NonNull Intent intent) {
+    public static Parcelable getOutputCropAspectRatio(@NonNull Intent intent) {
         return intent.getParcelableExtra(EXTRA_OUTPUT_CROP_ASPECT_RATIO);
     }
 

app/src/main/java/com/yalantis/ucrop/callback/BitmapCropCallback.java → app/src/main/java/com/uc/ucrop/callback/BitmapCropCallback.java

-package com.yalantis.ucrop.callback;
+package com.uc.ucrop.callback;
 
 import android.net.Uri;
 import android.support.annotation.NonNull;

app/src/main/java/com/yalantis/ucrop/callback/BitmapLoadCallback.java → app/src/main/java/com/uc/ucrop/callback/BitmapLoadCallback.java

-package com.yalantis.ucrop.callback;
+package com.uc.ucrop.callback;
 
 import android.graphics.Bitmap;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.yalantis.ucrop.model.ExifInfo;
+import com.uc.ucrop.model.ExifInfo;
 
 public interface BitmapLoadCallback {
 

app/src/main/java/com/yalantis/ucrop/callback/CropBoundsChangeListener.java → app/src/main/java/com/uc/ucrop/callback/CropBoundsChangeListener.java

-package com.yalantis.ucrop.callback;
+package com.uc.ucrop.callback;
 
 /**
  * Interface for crop bound change notifying.

app/src/main/java/com/yalantis/ucrop/callback/OverlayViewChangeListener.java → app/src/main/java/com/uc/ucrop/callback/OverlayViewChangeListener.java

-package com.yalantis.ucrop.callback;
+package com.uc.ucrop.callback;
 
 import android.graphics.RectF;
 

app/src/main/java/com/yalantis/ucrop/model/AspectRatio.java → app/src/main/java/com/uc/ucrop/model/AspectRatio.java

-package com.yalantis.ucrop.model;
+package com.uc.ucrop.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/com/yalantis/ucrop/model/CropParameters.java → app/src/main/java/com/uc/ucrop/model/CropParameters.java

-package com.yalantis.ucrop.model;
+package com.uc.ucrop.model;
 
 import android.graphics.Bitmap;