sdk修复bug

app/build.gradle

-apply plugin: 'com.android.application'
-/*apply plugin: 'com.android.library'
-apply plugin: 'maven'*/
+//apply plugin: 'com.android.application'
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
-
 kapt {
     arguments {
         arg("moduleName", project.getName())
@@ -16,8 +15,8 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        multiDexEnabled true
-        applicationId "com.mhq.smartorder"
+        /*multiDexEnabled true
+        applicationId "com.mhq.smartorder"*/
 
         minSdkVersion 26
         targetSdkVersion 30
@@ -34,15 +33,15 @@ android {
         ndk {
             abiFilters "armeabi-v7a", "armeabi", "x86"
         }
-        manifestPlaceholders = [
-                MTA_APPKEY : "AIAF8SC17A3L",
-                MTA_CHANNEL: "GooglePay"
-
-                //极光推送
-                /*    JPUSH_PKGNAME: applicationId,
-                    JPUSH_APPKEY : "xx", //JPush上注册的包名对应的appkey.
-                    JPUSH_CHANNEL: "xx-default", //暂时填写默认值即可.*/
-        ]
+        /* manifestPlaceholders = [
+                 MTA_APPKEY:"AIAF8SC17A3L",
+                 MTA_CHANNEL:"GooglePay"
+
+                 //极光推送
+                 *//*    JPUSH_PKGNAME: applicationId,
+                     JPUSH_APPKEY : "xx", //JPush上注册的包名对应的appkey.
+                     JPUSH_CHANNEL: "xx-default", //暂时填写默认值即可.*//*
+         ]*/
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -53,23 +52,26 @@ android {
         timeOutInMs=5*1000
         installOptions '-r','-s'
     }
+
 */
 
 
-    /*signingConfigs {
+    /*=============================================================================================*/
+   /* signingConfigs {
+
         def appStoreFilePath = System.getProperty('StoreFilePath')
         def appStorePassword = System.getProperty('StorePassword')
         def appKeyAlias = System.getProperty('KeyAlias')
         def appKeyPassword = System.getProperty('KeyPassword')
 
-        Properties properties = new Properties()
-        if (rootProject.file("local.properties").exists()) {
-            properties.load(rootProject.file("local.properties").newDataInputStream())
-            storeFilePath = properties.get("STOREFILE")
-            storePassword = properties.get("STOREPASSWORD")
-            keyAlias = properties.get("KEYALIAS")
-            keyPassword = properties.get("KEYPASSWORD")
-        }
+        *//*   Properties properties = new Properties()
+           if (rootProject.file("local.properties").exists()) {
+               properties.load(rootProject.file("local.properties").newDataInputStream())
+               storeFilePath= properties.get("STOREFILE")
+               storePassword= properties.get("STOREPASSWORD")
+               keyAlias= properties.get("KEYALIAS")
+               keyPassword= properties.get("KEYPASSWORD")
+           }*//*
 
         if (!appStoreFilePath || !appStorePassword || !appKeyAlias || !appKeyPassword) {
             //将.android下的debug.keystore放到app目录下
@@ -88,9 +90,9 @@ android {
             v2SigningEnabled true
         }
 
-    }*/
+    }
 
-   /* buildTypes {
+    buildTypes {
         debug {
 //            buildConfigField 'String','NAME','value'
             zipAlignEnabled true
@@ -113,9 +115,7 @@ android {
             signingConfig signingConfigs.jenkins
         }
 
-    }*/
-
-
+    }
     sourceSets.main {
         jniLibs.srcDirs = ['libs']
         java.srcDirs += 'src/support/java'
@@ -142,10 +142,11 @@ android {
                         //渠道，版本，构建时间
                         "Haha_${flavorName}_v${variant.versionName}_${buildTime()}.apk")
 
-//                output.outputFile=apkFile
+                //                output.outputFile=apkFile
             }
         }
-    }
+    }*/
+    /*==============================================================================*/
 }
 
 def buildTime() {
@@ -172,9 +173,7 @@ def getAppVersionCode() {
     }
     return stout.toString().split("\n").size()
 }
-
-
-/*ext {
+ext {
     GITHUB_REPO_PATH = "../../androidlibrary"
     PUBLISH_GROUP_ID = 'com.mhq.smartorder'
     PUBLISH_ARTIFACT_ID = 'smartorder'
@@ -191,18 +190,14 @@ uploadArchives {
             pom.version = project.PUBLISH_VERSION // 版本号
         }
     }
-}*/
-
-
-
-
+}
 
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //    api deps.support.multidex
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    //implementation 'com.google.android.gms:play-services-maps:16.1.0'
     //annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
     annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
     //kapt 'com.jakewharton:butterknife-compiler:8.4.0'
@@ -257,7 +252,6 @@ dependencies {
     api 'com.github.anzaizai:EasySwipeMenuLayout:1.1.4'
     api 'org.greenrobot:eventbus:3.1.1'
     //api 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-25'
-    //api 'com.google.android.gms:play-services-wallet:16.0.1'
     api 'com.tencent.qcloud:cosxml:5.4.25'
     api 'com.sunfusheng:marqueeview:1.3.3'
     /* api 'com.google.firebase:firebase-core:16.0.8'

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

@@ -18,6 +18,8 @@ import org.litepal.LitePal;
 import java.util.Locale;
 
 import cn.dankal.basiclib.image.Utils;
+import cn.dankal.basiclib.pojo.UserInfoBean;
+import cn.dankal.basiclib.pojo.UserResponseBody;
 import cn.dankal.basiclib.util.AppUtils;
 import cn.dankal.basiclib.util.DensityAdaptationUtils;
 import cn.dankal.basiclib.util.StringUtil;
@@ -32,31 +34,30 @@ import cn.dankal.basiclib.widget.loadsir.core.LoadSir;
 import cn.dankal.client.BuildConfig;
 
 
-
 public class ModooApplication extends Application {
     //개발 환경 인지 아 닌 지
     public static final boolean isDev = false;
 
-    private static ModooApplication context;
+    private static ModooApplication mContext;
 
     private static IWXAPI api;
 
     @Override
     public void onCreate() {
         super.onCreate();
-        context = this;
+        mContext = this;
 
         initARouter();
         initStetho();
         initLoadSir();
         //적합 한 방안.
-        DensityAdaptationUtils.setDensity(context, 375);
-        AppUtils.init(context);
+        //DensityAdaptationUtils.setDensity(context, 375);
+        AppUtils.init(mContext);
 
         //데이터베이스 초기 화 스 캔
         LitePal.initialize(this);
 
-        Utils.mAppContext=this.getApplicationContext();
+        Utils.mAppContext = this.getApplicationContext();
 
         //bugly
         //CrashReport.initCrashReport(getApplicationContext(), "74a2fc949e", isDev);
@@ -82,7 +83,7 @@ public class ModooApplication extends Application {
         // [선택 가능] debug 출력 여 부 를 설정 합 니 다. 로그 인 할 때 닫 으 십시오. Logcat 레이 블 은 "MTasDK" 입 니 다.
         //StatConfig.setDebugEnable(isDev);
         // 기초 통계 API
-       // StatService.registerActivityLifecycleCallbacks(this);
+        // StatService.registerActivityLifecycleCallbacks(this);
 
         String appkey = "AIAF8SC17A3L";
         // MTA 초기 화 및 시작
@@ -95,15 +96,15 @@ public class ModooApplication extends Application {
         //처리 버튼 여러 번 클릭 방지, 기본 1s，https://www.jianshu.com/p/7f3e5c8b8643
         ViewDoubleHelper.init(this);
 
-        Locale locale = context.getResources().getConfiguration().locale;
+        Locale locale = mContext.getResources().getConfiguration().locale;
         String language = locale.getLanguage();
-        if ("en".equals(language)){
+        if ("en".equals(language)) {
             SPUtil.getInstance(ModooApplication.getContext()).saveLanguage(2);
-        }else if ("ja".equals(language)){
+        } else if ("ja".equals(language)) {
             SPUtil.getInstance(ModooApplication.getContext()).saveLanguage(3);
-        }else if ("ko".equals(language)){
+        } else if ("ko".equals(language)) {
             SPUtil.getInstance(ModooApplication.getContext()).saveLanguage(1);
-        }else if ("zh".equals(language)){
+        } else if ("zh".equals(language)) {
             SPUtil.getInstance(ModooApplication.getContext()).saveLanguage(0);
         }
     }
@@ -131,9 +132,16 @@ public class ModooApplication extends Application {
     }
 
     public static Context getContext() {
-        return context;
+        return mContext;
+    }
+
+    public static ModooApplication getInstance() {
+        return mContext;
     }
 
+
+
+
     /**
      * 페 이 스 북 제작 보조 개발 도구
      */
@@ -167,7 +175,7 @@ public class ModooApplication extends Application {
 
     public static IWXAPI getIWXAPI() {
         //WXAPIFactory 공장 을 통 해 IWXAPI 의 인 스 턴 스 를 획득 합 니 다.
-        api = WXAPIFactory.createWXAPI(context, WxConstants.WX_APP_ID, true);
+        api = WXAPIFactory.createWXAPI(mContext, WxConstants.WX_APP_ID, true);
 
         //애플 리 케 이 션 의 appid 를 위 챗 에 등록 합 니 다.
         api.registerApp(WxConstants.WX_APP_ID);
@@ -190,7 +198,7 @@ public class ModooApplication extends Application {
     public static boolean isDarkMode() {
         int nightMode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
         if (nightMode == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
-            int applicationUiMode = context.getResources().getConfiguration().uiMode;
+            int applicationUiMode = mContext.getResources().getConfiguration().uiMode;
             int systemMode = applicationUiMode & Configuration.UI_MODE_NIGHT_MASK;
             return systemMode == Configuration.UI_MODE_NIGHT_YES;
         } else {
@@ -198,4 +206,40 @@ public class ModooApplication extends Application {
         }
     }
 
+    public static void setSDKLoginInfo(String token) {
+        ModooApplication.setLogin(true);
+        UserResponseBody userResponseBody = new UserResponseBody();
+        UserResponseBody.TokenBean tokenBean = new UserResponseBody.TokenBean();
+        tokenBean.token = token;
+        userResponseBody.setToken(tokenBean);
+        userResponseBody.setUserInfo(new UserInfoBean());
+        DKUserManager.saveUserInfo(userResponseBody);
+        DKUserManager.updateUserInfo(new UserInfoBean());
+    }
+
+    public static void outSDKLogin() {
+        ModooApplication.setLogin(false);
+        UserResponseBody userResponseBody = new UserResponseBody();
+        UserResponseBody.TokenBean tokenBean = new UserResponseBody.TokenBean();
+        tokenBean.token = "";
+        userResponseBody.setToken(tokenBean);
+        userResponseBody.setUserInfo(new UserInfoBean());
+        DKUserManager.saveUserInfo(userResponseBody);
+    }
+
+    public SDKLoginErrorListen mSDKLoginErrorListen;
+
+    public SDKLoginErrorListen getSDKLoginErrorListen() {
+        return mSDKLoginErrorListen;
+    }
+
+    public void setSDKLoginErrorListen(SDKLoginErrorListen mSDKLoginErrorListen) {
+        this.mSDKLoginErrorListen = mSDKLoginErrorListen;
+    }
+
+    public interface SDKLoginErrorListen {
+        void sdkLoginError(int code, String message);
+    }
+
+
 }

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

@@ -25,8 +25,9 @@ public class BaseApi {
     /*public static final String BASE_URL = isDev ? "https://api-koreadc.dankal.cn/v1/"
             : "https://modoo-api.mhqglobal.com/v1/";*/
 
-    public static final String BASE_URL = "https://api-koreadc.dankal.cn/v1/";
+    //public static final String BASE_URL = "https://api-koreadc.dankal.cn/v1/";
     //public static final String BASE_URL = "https://modoo-api.mhqglobal.com/v1/";
+    public static final String BASE_URL = "https://modoo-ic-api.mhqglobal.com/v1/";
 
     public static final String BASE_EXPRESS_URL = "https://info.sweettracker.co.kr/";
 

app/src/main/java/cn/dankal/basiclib/image/CaptureAndCropManager.java

@@ -17,7 +17,9 @@ import com.yanzhenjie.permission.Permission;
 import java.io.File;
 
 import cn.dankal.basiclib.ModooApplication;
+import cn.dankal.basiclib.util.FileUtils;
 import cn.dankal.client.R;
+import kotlin.jvm.JvmStatic;
 
 
 public final class CaptureAndCropManager
@@ -25,6 +27,7 @@ public final class CaptureAndCropManager
     public static final int REQUEST_CODE_CAPTURE = 200;
     public static final int REQUEST_CODE_CROP = 300;
     public static final int REQUEST_CODE_ALBUM = 400;
+    public static final int REQUEST_CODE_CAPTURE_CROP = 500;
 
     public static final String AUTHORITY = ModooApplication.getContext().getPackageName() + ".genericFile.provider";
 
@@ -168,7 +171,7 @@ public final class CaptureAndCropManager
     }
 
     // 填充裁剪的Intent
-    private static void fillCropIntent(Intent intent)
+    public static void fillCropIntent(Intent intent)
     {
         // 设置裁剪
         intent.putExtra("crop", "true");
@@ -270,7 +273,6 @@ public final class CaptureAndCropManager
     {
         mOutCameraCaptureImageFile = new File(FileUtil.getCacheDir(),
                 "capture_" + System.currentTimeMillis() + ".jpg");
-
         Intent intentToTakePhoto = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
         Uri imageUri;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)

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

 package cn.dankal.basiclib.image;
 
 import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
 
@@ -17,8 +19,14 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Locale;
 
+import cn.dankal.basiclib.ModooApplication;
+
+import static android.os.Environment.DIRECTORY_PICTURES;
+
 public final class FileUtil
 {
     private FileUtil()
@@ -65,6 +73,42 @@ public final class FileUtil
         return f;
     }
 
+    public static File getAppRootDirPath() {
+        return ModooApplication.getContext().getExternalFilesDir(null).getAbsoluteFile();
+    }
+
+    public static File createImageFile(Context context,boolean isCrop) {
+        try {
+            String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+            String fileName = "";
+            if (isCrop) {
+                fileName = "IMG_" + timeStamp + "_CROP.jpg";
+            } else {
+                fileName = "IMG_" + timeStamp + ".jpg";
+            }
+            File rootFile = new File(getAppRootDirPath() + File.separator + "capture");
+            if (!rootFile.exists()) {
+                rootFile.mkdirs();
+            }
+            File imgFile;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                imgFile = new File(Environment.getExternalStoragePublicDirectory(DIRECTORY_PICTURES) + File.separator + fileName);
+                // 通过 MediaStore API 插入file 为了拿到系统裁剪要保存到的uri（因为App没有权限不能访问公共存储空间，需要通过 MediaStore API来操作）
+                ContentValues values = new ContentValues();
+                values.put(MediaStore.Images.Media.DATA, imgFile.getAbsolutePath());
+                values.put(MediaStore.Images.Media.DISPLAY_NAME, fileName);
+                values.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
+                //uri = context.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+            } else {
+                imgFile = new File(rootFile.getAbsolutePath() + File.separator + fileName);
+            }
+            return imgFile;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     // 取得App的文件目录，在sd卡根目录下用包名为目录名，或者在内部的存储目录，用/结尾
     public static String getAppDir()
     {

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

@@ -35,7 +35,7 @@ public abstract class AbstractSubscriber<T> implements Observer<T> {
         if (e instanceof LocalException) {
             LocalException exception = (LocalException) e;
             //401 重新获取access token , 如果还返回412 就是refresh token 也失效了。需要重新登录
-            if (exception.getErrorCode() == HttpStatusCode.TOKEN_INVAILD ||
+           /* if (exception.getErrorCode() == HttpStatusCode.TOKEN_INVAILD ||
                     exception.getErrorCode() == HttpStatusCode.UNAUTHORIZED) {
                 view.tokenInvalid();
                 view.showToast(ModooApplication.getContext().getString(R.string.login_Invalid));
@@ -52,6 +52,10 @@ public abstract class AbstractSubscriber<T> implements Observer<T> {
                 }
             } else {
                 view.showToast(exception.getMsg());
+            }*/
+
+            if (ModooApplication.getInstance().mSDKLoginErrorListen!=null){
+                ModooApplication.getInstance().mSDKLoginErrorListen.sdkLoginError(exception.getErrorCode(),exception.getMsg());
             }
         } else {
             Log.e("SubscriberThrowable", e.getMessage());

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

@@ -24,7 +24,7 @@ public final class AppUtils {
             sActivityList.add(activity);
             setTopActivityWeakRef(activity);
             //适配方案
-            DensityAdaptationUtils.setDefault(activity);
+            //DensityAdaptationUtils.setDefault(activity);
         }
 
         @Override

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

 package cn.dankal.basiclib.util;
 
 import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -31,6 +32,8 @@ import java.util.Locale;
 
 import cn.dankal.basiclib.ModooApplication;
 
+import static android.os.Environment.DIRECTORY_PICTURES;
+
 
 /**
  * @author vane
@@ -403,4 +406,56 @@ public class FileUtils {
         file.delete();
     }
 
+
+    public static File getAppRootDirPath() {
+        return ModooApplication.getContext().getExternalFilesDir(null).getAbsoluteFile();
+    }
+    public static Uri uri;
+    public static File createImageFile(Context context,boolean isCrop) {
+        try {
+            String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+            String fileName = "";
+            if (isCrop) {
+                fileName = "IMG_"+timeStamp+"_CROP.jpg";
+            } else {
+                fileName = "IMG_"+timeStamp+".jpg";
+            }
+            File rootFile = new File(getAppRootDirPath() + File.separator + "capture");
+            if (!rootFile.exists()) {
+                rootFile.mkdirs();
+            }
+            File imgFile;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                imgFile = new File(Environment.getExternalStoragePublicDirectory(DIRECTORY_PICTURES) + File.separator + fileName);
+                // 通过 MediaStore API 插入file 为了拿到系统裁剪要保存到的uri（因为App没有权限不能访问公共存储空间，需要通过 MediaStore API来操作）
+                ContentValues values = new ContentValues();
+                values.put(MediaStore.Images.Media.DATA, imgFile.getAbsolutePath());
+                values.put(MediaStore.Images.Media.DISPLAY_NAME, fileName);
+                values.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
+                uri = context.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+            }else {
+                imgFile = new File(rootFile.getAbsolutePath() + File.separator + fileName);
+            }
+            return imgFile;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static File getCropFile(Context context,Uri uri){
+        String[] proj = { MediaStore.Images.Media.DATA };
+        Cursor cursor = context.getContentResolver().query(uri, proj, null, null, null);
+
+        if (cursor.moveToFirst()) {
+            int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+            String path = cursor.getString(columnIndex);
+            cursor.close();
+            return new File(path);
+        }
+
+
+        return null;
+    }
+
 }

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

@@ -34,9 +34,9 @@ import cn.dankal.client.ui.home.ScanResultActivity
 import cn.dankal.client.ui.home.details.MerchantDetailsActivity
 import cn.dankal.client.ui.personal.PersonalFragment
 import cn.dankal.client.ui.shop.ShopFragment
-import com.google.android.gms.maps.GoogleMap
+/*import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.OnMapReadyCallback
-import com.google.android.gms.tasks.OnCompleteListener
+import com.google.android.gms.tasks.OnCompleteListener*/
 import com.google.gson.Gson
 import com.yanzhenjie.permission.Permission
 import com.yzq.zxinglibrary.common.Constant
@@ -46,10 +46,10 @@ import okhttp3.ResponseBody
 import java.lang.reflect.Field
 
 
-class MainActivity : BaseActivity(), OnMapReadyCallback {
-    override fun onMapReady(p0: GoogleMap?) {
+class MainActivity : BaseActivity() {
+  /*  override fun onMapReady(p0: GoogleMap?) {
         mMap = p0
-    }
+    }*/
 
     /**
      * 저번 에 리 턴 누 른 시간.
@@ -68,7 +68,7 @@ class MainActivity : BaseActivity(), OnMapReadyCallback {
 
     private var mRxPermissions: RxPermissions? = null
 
-    private var mMap: GoogleMap? = null
+    //private var mMap: GoogleMap? = null
 
     private var mSectionsPagerAdapter: SectionsPagerAdapter? = null
 
@@ -169,7 +169,7 @@ class MainActivity : BaseActivity(), OnMapReadyCallback {
 
     //지 도 를 초기 화하 여 경 위 를 얻다.
     private fun initializeMap() {
-        var location: Location? = mMap?.getMyLocation()
+     /*   var location: Location? = mMap?.getMyLocation()
         try {
             location?.let {
                 SPUtils.put(ConstantsHomeType.LATITUDE, it.latitude.toString())
@@ -177,7 +177,7 @@ class MainActivity : BaseActivity(), OnMapReadyCallback {
             }
         } catch (e: Exception) {
             e.printStackTrace()
-        }
+        }*/
 
     }
 

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

@@ -25,7 +25,7 @@ import cn.dankal.basiclib.util.SPUtils
 import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.client.R
 import cn.dankal.client.constants.ConstantsHomeType
-import cn.dankal.client.ui.home.map.GoogleMapsActivity
+//import cn.dankal.client.ui.home.map.GoogleMapsActivity
 import cn.dankal.entities.event.LocationChangeEvent
 import cn.dankal.entities.home.TopHomeInfoEntity
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
@@ -38,6 +38,7 @@ 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.MyQueueActivity
 import cn.dankal.entities.home.QRCodeEntity
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.google.gson.Gson
@@ -61,9 +62,10 @@ class HomeActivity : BaseActivity(), View.OnClickListener {
                 requestPermission(Permission.CAMERA) {
                     startActivityForResult(Intent(this, CaptureActivity::class.java), ConstantsHomeType.SCAN)
                 }
+                //startActivity(Intent(this@HomeActivity, MyQueueActivity::class.java))
             }
             R.id.iv_home_location -> {
-                startActivity(Intent(this, GoogleMapsActivity::class.java))
+                //startActivity(Intent(this, GoogleMapsActivity::class.java))
             }
         }
     }

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

@@ -32,7 +32,7 @@ import cn.dankal.entities.home.TopHomeInfoEntity
 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.home.map.GoogleMapsActivity
 import cn.dankal.client.ui.shop.ShopDetailActivity
 import cn.dankal.client.ui.shop.WebViewContentActivity
 import cn.dankal.entities.event.LocationChangeEvent
@@ -68,7 +68,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener {
                 }
             }
             R.id.iv_home_location -> {
-                activity?.startActivity(Intent(context, GoogleMapsActivity::class.java))
+                //activity?.startActivity(Intent(context, GoogleMapsActivity::class.java))
             }
         }
     }

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

@@ -49,7 +49,7 @@ import cn.dankal.client.adapter.MenuItemAdapter;
 import cn.dankal.client.constants.ConstantsHomeType;
 import cn.dankal.client.ui.home.details.MerchantDetailsActivity;
 import cn.dankal.client.ui.home.details.RecommendMerchantActivity;
-import cn.dankal.client.ui.home.map.GoogleMapsActivity;
+//import cn.dankal.client.ui.home.map.GoogleMapsActivity;
 import cn.dankal.client.util.UIUtile;
 import io.reactivex.rxjava3.disposables.Disposable;
 
@@ -271,7 +271,7 @@ public class MenuItemFragment extends BaseFragment {
         ImageView ivSearch = view.findViewById(R.id.iv_home_search);
         ImageView ivHomeSweep = view.findViewById(R.id.iv_home_sweep);
 
-        ivHomeLocation.setOnClickListener(v -> getActivity().startActivity(new Intent(getActivity(), GoogleMapsActivity.class)));
+        //ivHomeLocation.setOnClickListener(v -> getActivity().startActivity(new Intent(getActivity(), GoogleMapsActivity.class)));
 
         ivSearch.setOnClickListener(v -> getActivity().startActivity(new Intent(getActivity(), SearchShopActivity.class)));
 

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

@@ -9,7 +9,7 @@ import cn.dankal.basiclib.util.WebViewUtil
 import cn.dankal.basiclib.widget.dialog.CallDialog
 import cn.dankal.entities.home.RestaurantDetailEntity
 import cn.dankal.client.R
-import cn.dankal.client.ui.home.map.GoogleMapsMerchantActivity
+//import cn.dankal.client.ui.home.map.GoogleMapsMerchantActivity
 import kotlinx.android.synthetic.main.fragment_details_info.*
 
 private const val ARG_PARAM1 = "param1"
@@ -34,20 +34,20 @@ class DetailsInfoFragment : BaseFragment(), View.OnClickListener, CallDialog.OnC
                 // startActivity(Intent(activity, OrderResultActivity::class.java))
             }
             R.id.iv_location -> {
-                toMaps()
+                //toMaps()
             }
             R.id.tv_merchant_address -> {
-                toMaps()
+                //toMaps()
             }
         }
     }
 
     private fun toMaps() {
-        var intent = Intent(activity, GoogleMapsMerchantActivity::class.java)
+       /* var intent = Intent(activity, GoogleMapsMerchantActivity::class.java)
         var bundle = Bundle()
         bundle.putSerializable(ARG_PARAM1, param1)
         intent.putExtras(bundle)
-        startActivity(intent)
+        startActivity(intent)*/
     }
 
     override fun getLayoutId(): Int {

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

@@ -4,21 +4,16 @@ package cn.dankal.client.ui.home.details;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.ArrayMap;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -401,6 +396,7 @@ public class DetailsShopFragment extends BaseFragment implements OnRefreshLoadMo
         carAdapter = new ShopBottomListAdapter(R.layout.item_shop_bottom_list, listItemEntities, () -> findCarShop());
         rvCar.setAdapter(carAdapter);
 
+
         requestIsMerchantOrder();
     }
 
@@ -594,6 +590,8 @@ public class DetailsShopFragment extends BaseFragment implements OnRefreshLoadMo
                                 }
                             } else if (beans.get(0).getIs_over_number() == 1) {//줄 서기 성공
                                 setBottomState(2);
+                            }else if (beans.get(0).getIs_over_number()==3){
+                                setBottomState(1);
                             }
                         }
                     } else {
@@ -618,7 +616,7 @@ public class DetailsShopFragment extends BaseFragment implements OnRefreshLoadMo
      * @param entity
      */
     private void showBottomDialog(ShopTypeContentEntity.DataBean dataBean, RestaurantSpecEntity entity) {
-        View view = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_select_format, null, false);
+        View view = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_select_format_tow, null, false);
 
         final TagFlowLayout flowLayoutOne = view.findViewById(R.id.fl_tag_one);
         TextView mainName = view.findViewById(R.id.tv_format);
@@ -930,12 +928,12 @@ public class DetailsShopFragment extends BaseFragment implements OnRefreshLoadMo
                     enabledButton();
                 } else {
                     tvBottomShopButton.setBackgroundColor(getResources().getColor(R.color.btn_bg));
-                    tvBottomShopButton.setTextColor(getResources().getColor(R.color.color_171717));
+                    tvBottomShopButton.setTextColor(getResources().getColor(R.color.white));
                     tvBottomShopButton.setEnabled(true);
                     tvBottomShopButton.setText(R.string.selected);
 
                     tvSettlement.setBackgroundColor(getResources().getColor(R.color.btn_bg));
-                    tvSettlement.setTextColor(getResources().getColor(R.color.color_171717));
+                    tvSettlement.setTextColor(getResources().getColor(R.color.white));
                     tvSettlement.setEnabled(true);
                     tvSettlement.setText(R.string.go_to_settlement);
                 }

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

@@ -268,7 +268,7 @@ class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
     }
 
     private fun showBottomDialog(entity: RestaurantSpecEntity) {
-        val view = LayoutInflater.from(this).inflate(R.layout.dialog_select_format, null, false)
+        val view = LayoutInflater.from(this).inflate(R.layout.dialog_select_format_tow, null, false)
         val flowLayoutOne = view.findViewById<TagFlowLayout>(R.id.fl_tag_one)
         val mainName = view.findViewById<TextView>(R.id.tv_format)
         val price = view.findViewById<TextView>(R.id.tv_restaurant_price)

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

@@ -8,7 +8,10 @@ import android.support.v7.widget.LinearLayoutCompat
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
-import android.view.*
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.*
 import cn.dankal.basiclib.api.RestaurantServiceFactory
 import cn.dankal.basiclib.base.activity.BaseActivity
@@ -20,7 +23,6 @@ import cn.dankal.basiclib.util.ButtonUtil
 import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.basiclib.util.WebViewUtil
 import cn.dankal.basiclib.widget.banner.DkBanner
-import cn.dankal.entities.home.*
 import cn.dankal.client.R
 import cn.dankal.client.adapter.home.ShopBottomListAdapter
 import cn.dankal.client.adapter.home.ShopSpecListAdapter
@@ -36,6 +38,7 @@ import cn.dankal.client.ui.shop.QueueResultActivity
 import cn.dankal.client.util.FindUtil
 import cn.dankal.client.util.UIUtile
 import cn.dankal.entities.event.ShopCarRefreshEvent
+import cn.dankal.entities.home.*
 import com.google.gson.Gson
 import com.yanzhenjie.permission.Permission
 import com.yzq.zxinglibrary.android.CaptureActivity
@@ -48,7 +51,7 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.litepal.LitePal
 import java.io.Serializable
-import java.util.ArrayList
+import java.util.*
 
 class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesView {
 
@@ -81,6 +84,8 @@ class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesVie
                         }, true)
                     } else if (beans[0].is_over_number == 1) {//줄 서기 성공
                         showState = 2
+                    } else if (beans[0].is_over_number == 3) {
+                        showState = 1
                     }
                 }
             }
@@ -307,7 +312,7 @@ class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesVie
     }
 
     private fun showBottomDialog(entity: RestaurantSpecEntity) {
-        val view = LayoutInflater.from(this).inflate(R.layout.dialog_select_format, null, false)
+        val view = LayoutInflater.from(this).inflate(R.layout.dialog_select_format_tow, null, false)
         val flowLayoutOne = view.findViewById<TagFlowLayout>(R.id.fl_tag_one)
         val mainName = view.findViewById<TextView>(R.id.tv_format)
         val price = view.findViewById<TextView>(R.id.tv_restaurant_price)

app/src/main/java/cn/dankal/client/ui/personal/order/food/FoodEvaluationActivity.kt

 package cn.dankal.client.ui.personal.order.food
 
-import android.app.Activity
 import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
 import android.support.design.widget.BottomSheetDialog
 import android.support.v4.content.ContextCompat
+import android.support.v4.content.FileProvider
 import android.support.v7.widget.AppCompatButton
 import android.support.v7.widget.GridLayoutManager
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import cn.dankal.basiclib.api.RestaurantServiceFactory
@@ -18,10 +20,13 @@ import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.base.callback.DKCallBackBoolean
 import cn.dankal.basiclib.cos.CosUploadUtil
 import cn.dankal.basiclib.image.CaptureAndCropManager
+import cn.dankal.basiclib.image.CaptureAndCropManager.*
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
+import cn.dankal.basiclib.util.FileUtils
 import cn.dankal.basiclib.util.ToastUtils
 import cn.dankal.basiclib.util.image.PicUtils
 import cn.dankal.basiclib.widget.FullyGridLayoutManager
+import cn.dankal.client.BuildConfig
 import cn.dankal.client.R
 import cn.dankal.client.adapter.shop.GridImageNewAdapter
 import cn.dankal.entities.home.EvaluationCommitEntity
@@ -31,6 +36,7 @@ import com.luck.picture.lib.entity.LocalMedia
 import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_food_evaluation.*
 import okhttp3.ResponseBody
+import java.io.File
 
 /**
  * 식당 평가
@@ -152,8 +158,10 @@ class FoodEvaluationActivity : BaseActivity(), GridImageNewAdapter.onAddPicClick
             mBottomDialog.dismiss()
         }
         bottomView.findViewById<AppCompatButton>(R.id.photodialog_btn_native).setOnClickListener {
-            CaptureAndCropManager.capturePhotoFromGallery(this,
-                    CaptureAndCropManager.REQUEST_CODE_ALBUM)
+            /*CaptureAndCropManager.capturePhotoFromGallery(this,
+                    CaptureAndCropManager.REQUEST_CODE_ALBUM)*/
+            val intent = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
+            startActivityForResult(intent, REQUEST_CODE_ALBUM)
             mBottomDialog.dismiss()
         }
         bottomView.findViewById<AppCompatButton>(R.id.photodialog_btn_cancel).setOnClickListener {
@@ -192,24 +200,50 @@ class FoodEvaluationActivity : BaseActivity(), GridImageNewAdapter.onAddPicClick
         })
     }
 
+    var imageCropFile: File? = null
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == REQUEST_CODE_CAPTURE) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                val uri = FileProvider.getUriForFile(this, "cn.dankal.client" + ".provider", CaptureAndCropManager.getLastCameraCaptureImageFile());
+                gotoCrop(uri)
+            } else {
+                gotoCrop(Uri.fromFile(CaptureAndCropManager.getLastCameraCaptureImageFile()));
+            }
 
-        if (resultCode == Activity.RESULT_OK) {
-
-            when (requestCode) {
-                CaptureAndCropManager.REQUEST_CODE_CAPTURE ->  {
-                    CaptureAndCropManager.cropPhotoAfterCapture(this,
-                            CaptureAndCropManager.REQUEST_CODE_CROP)
-                }
-                CaptureAndCropManager.REQUEST_CODE_ALBUM -> if (data != null && data.data != null) {
+        } else if (requestCode == REQUEST_CODE_ALBUM) {
+            if (data != null && data.getData() != null) {
+                //打开系统裁剪
+                gotoCrop(data.getData());
+            }
+        } else if (resultCode == RESULT_OK && requestCode == REQUEST_CODE_CAPTURE_CROP) {
+            //显示页面上
+            if (imageCropFile != null && imageCropFile?.getAbsolutePath() != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    if (FileUtils.uri != null) {
+                        // 通过存储的uri 查询File
+                        imageCropFile = FileUtils.getCropFile(this, FileUtils.uri);
+                        //GlideUtils.loadLocalImage(this, FileUtils.uri, -1, iv_avatar);
+                        val file = imageCropFile
+                        file?.apply {
+                            var path = path
+                            listImage.add(path)
+                            val avatar = path.substring(path.lastIndexOf("/") + 1)
+                            commitListImage.add(avatar)
+
+                            tv_img_count.text = "(${listImage.size}/6)"
+
+                            adapter?.let {
+                                it.setList(listImage)
+                                it.notifyDataSetChanged()
+                            }
+                        }
 
-                    CaptureAndCropManager.cropPhotoFromUri(this, data.data,
-                            CaptureAndCropManager.REQUEST_CODE_CROP)
-                }
-                CaptureAndCropManager.REQUEST_CODE_CROP -> {
-                    if (data != null) {
-                        val file = CaptureAndCropManager.getLastCropImageFile()
+                    }
+                } else {
+                    //GlideUtils.loadLocalImage(this, imageCropFile?.getAbsolutePath(), -1, iv_avatar);
+                    val file = imageCropFile
+                    file?.apply {
                         var path = file.path
                         listImage.add(path)
                         val avatar = path.substring(path.lastIndexOf("/") + 1)
@@ -226,4 +260,29 @@ class FoodEvaluationActivity : BaseActivity(), GridImageNewAdapter.onAddPicClick
             }
         }
     }
+
+    private fun gotoCrop(sourceUri: Uri?) {
+        imageCropFile = FileUtils.createImageFile(this, true)
+        if (imageCropFile != null) {
+            val intent = Intent("com.android.camera.action.CROP")
+            intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+           /* intent.putExtra("crop", "true")
+            intent.putExtra("aspectX", 1) //X方向上的比例
+            intent.putExtra("aspectY", 1) //Y方向上的比例
+            intent.putExtra("outputX", 256) //裁剪区的宽
+            intent.putExtra("outputY", 256) //裁剪区的高
+            intent.putExtra("scale ", true) //是否保留比例
+           intent.putExtra("return-data", false)
+            intent.putExtra("outputFormat", Bitmap.CompressFormat.JPEG.toString())*/
+            CaptureAndCropManager.fillCropIntent(intent)
+            intent.setDataAndType(sourceUri, "image/*") //设置数据源
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                intent.putExtra(MediaStore.EXTRA_OUTPUT, FileUtils.uri)
+            } else {
+                val imgCropUri: Uri = Uri.fromFile(imageCropFile)
+                intent.putExtra(MediaStore.EXTRA_OUTPUT, imgCropUri)
+            }
+            startActivityForResult(intent, REQUEST_CODE_CAPTURE_CROP)
+        }
+    }
 }

app/src/main/java/cn/dankal/client/ui/personal/order/food/OrderDetailsActivity.kt

 package cn.dankal.client.ui.personal.order.food
 
 import android.content.Intent
+import android.support.v4.content.ContextCompat
 import android.support.v7.widget.LinearLayoutManager
 import android.view.View
 import cn.dankal.basiclib.api.UserServiceFactory
@@ -173,19 +174,79 @@ class OrderDetailsActivity : BaseActivity(), View.OnClickListener, CallListDialo
                     mStoreUUID = hotel_store_uuid
 
                     var status = when (order_status) {
-                        0 -> getString(R.string.to_be_paid)
-                        1 -> getString(R.string.paymented)
-                        2 -> getString(R.string.application_for_refund)
-                        3 -> getString(R.string.to_be_received)
-                        4 -> getString(R.string.completed)
-                        5 -> getString(R.string.cancelled)
-                        6 -> getString(R.string.only_refund)
-                        7 -> getString(R.string.refund)
-                        8 -> getString(R.string.successful_refund_only)
-                        9 -> getString(R.string.successful_refund)
-                        10 -> getString(R.string.refusal_of_refund)
-                        11 -> getString(R.string.successful_partial_refund)
-                        12 -> getString(R.string.successful_full_refund)
+                        0 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.btn_bg))
+                            getString(R.string.to_be_paid)
+
+                        }
+                        1 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.btn_bg))
+                            getString(R.string.paymented)
+
+                        }
+                        2 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.btn_bg))
+                            getString(R.string.application_for_refund)
+
+                        }
+                        3 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.btn_bg))
+                            getString(R.string.to_be_received)
+
+
+                        }
+                        4 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.completed)
+
+                        }
+                        5 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.cancelled)
+
+
+                        }
+                        6 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.only_refund)
+
+
+                        }
+                        7 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.refund)
+
+
+                        }
+                        8 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.successful_refund_only)
+
+
+                        }
+                        9 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.successful_refund)
+
+
+                        }
+                        10 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.btn_bg))
+                            getString(R.string.refusal_of_refund)
+
+
+                        }
+                        11 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.successful_partial_refund)
+
+
+                        }
+                        12 -> {
+                            tv_details_restaurant_status.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.font_A2A2A2))
+                            getString(R.string.successful_full_refund)
+
+                        }
                         else -> ""
                     }
 

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

@@ -9,7 +9,7 @@ import cn.dankal.basiclib.util.WebViewUtil
 import cn.dankal.basiclib.widget.dialog.CallDialog
 import cn.dankal.entities.shop.MerchantHomeEntity
 import cn.dankal.client.R
-import cn.dankal.client.ui.home.map.GoogleMapsMallActivity
+//import cn.dankal.client.ui.home.map.GoogleMapsMallActivity
 import kotlinx.android.synthetic.main.fragment_details_info.*
 
 private const val ARG_PARAM1 = "param1"
@@ -43,11 +43,11 @@ class MerchantInfoFragment : BaseFragment(), View.OnClickListener, CallDialog.On
     }
 
     private fun toMaps() {
-        var intent = Intent(activity, GoogleMapsMallActivity::class.java)
+       /* var intent = Intent(activity, GoogleMapsMallActivity::class.java)
         var bundle = Bundle()
         bundle.putSerializable(ARG_PARAM1, param1)
         intent.putExtras(bundle)
-        startActivity(intent)
+        startActivity(intent)*/
     }
 
     override fun getLayoutId(): Int {

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

@@ -188,6 +188,7 @@ public class QueueResultActivity extends BaseActivity {
                     intent.putExtra(ConstantsRestaurantType.UUID, commitQueueEntity.getHotel_uuid());
                 }
                 startActivity(intent);
+                finish();
             } else {//주문 할 게 요.
                 if (tablesNumber == 0) {//스 캔 을 가다
                     startActivityForResult(new Intent(QueueResultActivity.this, CaptureActivity.class), ConstantsHomeType.SCAN);

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

@@ -16,7 +16,7 @@ import cn.dankal.client.R
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
-import com.google.android.gms.tasks.OnCompleteListener
+//import com.google.android.gms.tasks.OnCompleteListener
 import kotlinx.android.synthetic.main.activity_find_email_tow.*
 import okhttp3.ResponseBody
 

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

@@ -24,7 +24,7 @@ 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_sdk.*
-import com.google.android.gms.tasks.OnCompleteListener
+//import com.google.android.gms.tasks.OnCompleteListener
 import com.mhq.smartorder.wxapi.WXEntryActivity
 import cn.dankal.basiclib.util.rx.RxPermissions
 import com.tencent.mm.opensdk.modelmsg.SendAuth

app/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java

@@ -252,7 +252,7 @@ public class CaptureActivity extends BaseActivity implements SurfaceHolder.Callb
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(getString(R.string.scan_code));
         builder.setMessage(getString(R.string.msg_camera_framework_bug));
-        builder.setPositiveButton(R.string.button_ok, new FinishListener(this));
+        builder.setPositiveButton(R.string.button_ok_tow, new FinishListener(this));
         builder.setOnCancelListener(new FinishListener(this));
         builder.show();
     }

app/src/main/res/drawable/bg_button_return.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#ffff6b5c" />
+    <solid android:color="@color/btn_bg" />
     <corners android:radius="17dp" />
 
 </shape>
\ No newline at end of file

app/src/main/res/drawable/bg_dialog_btn_one.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#ffff6b5c" />
+    <solid android:color="@color/btn_bg" />
     <corners android:radius="5dp" />
 </shape>
\ No newline at end of file

app/src/main/res/drawable/label_text_selector.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/color_171717" android:state_checked="true" />
+    <item android:color="@color/white" android:state_checked="true" />
     <item android:color="@color/font_313131" />
 </selector>
\ No newline at end of file

app/src/main/res/drawable/tag_select_textcolor_night.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FBBC39" />
+    <solid android:color="@color/color_89c7d4" />
     <corners android:radius="3dp" />
 </shape>
\ No newline at end of file

app/src/main/res/drawable/tag_select_textcolor_tow.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#FEEAE6" />
+    <solid android:color="@color/color_89c7d4" />
     
 </shape>
\ No newline at end of file

app/src/main/res/layout-night/adapter_layout_personal_empty_data_tow.xml

@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_126"
-        android:src="@mipmap/ic_line_empty" />
+        android:src="@mipmap/pic_profiling_monochromatic" />
 
     <TextView
         android:id="@+id/tv_text_tip"

app/src/main/res/layout/activity_appeal_result.xml

@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/dp_80"
-        android:src="@mipmap/ic_home_pay_success"/>
+        android:src="@mipmap/ic_successful"/>
 
     <TextView
         android:layout_width="wrap_content"

app/src/main/res/layout/activity_capture.xml

@@ -46,7 +46,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="400dp"
                 android:text="@string/wechat_two_dimensional_code"
-                android:textColor="#F7B938"
+                android:textColor="@color/color_89c7d4"
                 android:textSize="16sp" />
         </FrameLayout>
 

app/src/main/res/layout/activity_dishes_details.xml

@@ -78,7 +78,7 @@
                         android:paddingRight="@dimen/dp_9"
                         android:paddingBottom="@dimen/dp_5"
                         android:text="@string/selection_of_specifications"
-                        android:textColor="@color/color_171717"
+                        android:textColor="@color/white"
                         android:textSize="@dimen/sp_12"
                         android:visibility="gone" />
 

app/src/main/res/layout/activity_food_evaluation.xml

@@ -62,6 +62,7 @@
                         app:mImageHeight="@dimen/dp_15"
                         app:mImageWidth="@dimen/dp_15"
                         app:mMargin="@dimen/dp_5"
+                        app:mIsClick="true"
                         app:mStarChoose="0" />
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/layout/activity_google_maps.xml

-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rl_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="cn.dankal.client.ui.home.map.GoogleMapsActivity">
-
-    <fragment
-        android:id="@+id/map"
-        android:name="com.google.android.gms.maps.SupportMapFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="cn.dankal.client.ui.home.map.GoogleMapsActivity" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="@dimen/dp_45"
-        android:layout_marginRight="@dimen/dp_20"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/iv_location"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_40"
-            android:background="@mipmap/ic_1" />
-
-        <ImageView
-            android:id="@+id/iv_menu"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginTop="@dimen/dp_18"
-            android:background="@mipmap/ic_2" />
-    </LinearLayout>
-</RelativeLayout>

app/src/main/res/layout/activity_home.xml

@@ -89,7 +89,7 @@
                         android:layout_height="@dimen/dp_30"
                         android:layout_marginLeft="@dimen/dp_10"
                         android:layout_marginTop="@dimen/dp_17"
-                        tl:tl_indicator_color="@color/color_ff6b5c"
+                        tl:tl_indicator_color="@color/color_89c7d4"
                         tl:tl_indicator_height="@dimen/dp_2"
                         tl:tl_indicator_width_equal_title="true"
                         tl:tl_tab_padding="@dimen/dp_8"

app/src/main/res/layout/activity_maps.xml

-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:map="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <fragment
-        android:id="@+id/map"
-        android:name="com.google.android.gms.maps.SupportMapFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="com.arsy.googlemapsrippleeffect.MapsActivity" />
-
-    <LinearLayout
-        android:layout_width="40dp"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/startstopripple"
-        android:layout_alignParentLeft="true"
-        android:layout_margin="6dp"
-        android:orientation="vertical">
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@color/colorPrimary"
-            android:onClick="simpleRipple"
-            android:text="S\ni\nm\np\nl\ne\n"
-            android:textColor="#ffffff" />
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="6dp"
-            android:layout_weight="1"
-            android:background="@color/colorPrimary"
-            android:onClick="advancedRipple"
-            android:text="M\nu\nl\nt\ni\np\nl\ne"
-            android:textColor="#ffffff" />
-
-    </LinearLayout>
-
-    <Button
-        android:layout_width="40dp"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/startstopripple"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="6dp"
-        android:layout_marginRight="6dp"
-        android:layout_marginTop="60dp"
-        android:background="@color/colorPrimary"
-        android:onClick="radarAnimation"
-        android:text="R\na\nd\na\nr\n"
-        android:textColor="#ffffff" />
-
-    <Button
-        android:id="@+id/startstopripple"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="6dp"
-        android:layout_marginLeft="6dp"
-        android:layout_marginRight="6dp"
-        android:background="@color/colorPrimary"
-        android:onClick="startstopAnimation"
-        android:text="Stop Animation"
-        android:textColor="#ffffff" />
-</RelativeLayout>

app/src/main/res/layout/activity_order_result.xml

@@ -60,7 +60,7 @@
                     android:paddingRight="@dimen/dp_10"
                     android:paddingBottom="@dimen/dp_5"
                     android:text="@string/change_table_number"
-                    android:textColor="@color/color_171717"
+                    android:textColor="@color/white"
                     android:textSize="@dimen/sp_12" />
             </LinearLayout>
 
@@ -237,7 +237,7 @@
                 style="@style/ButtonText"
                 android:layout_width="@dimen/dp_151"
                 android:layout_height="@dimen/dp_48"
-                android:textColor="@color/color_171717"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_17"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_cancel"

app/src/main/res/layout/activity_queue.xml

@@ -94,7 +94,7 @@
             android:layout_marginRight="@dimen/dp_20"
             android:background="@drawable/bg_button_select_language"
             android:text="@string/queue_number"
-            android:textColor="@color/color_171717"
+            android:textColor="@color/white"
             android:textSize="16sp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/activity_search.xml

@@ -34,7 +34,7 @@
             android:paddingLeft="@dimen/dp_14"
             android:paddingRight="@dimen/dp_15"
             android:text="@string/search"
-            android:textColor="@color/font_orange"
+            android:textColor="@color/btn_bg"
             android:textSize="@dimen/sp_14" />
     </LinearLayout>
 

app/src/main/res/layout/adapter_layout_empty_order.xml

@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="130dp"
-        android:src="@mipmap/ic_order_confirmation" />
+        android:src="@mipmap/ic_order_confirmation_food" />
 
     <TextView
         android:layout_width="wrap_content"

app/src/main/res/layout/adapter_layout_personal_empty_data_tow.xml

@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_126"
-        android:src="@mipmap/pic_my_home_no_line_up" />
+        android:src="@mipmap/pic_profiling_monochromatic" />
 
     <TextView
         android:id="@+id/tv_text_tip"

app/src/main/res/layout/dialog_home_filter.xml

@@ -152,7 +152,7 @@
                 android:layout_width="0dp"
                 android:layout_height="@dimen/dp_50"
                 android:layout_weight="1"
-                android:background="@color/btn_bg"
+                android:background="@color/color_89c7d4"
                 android:gravity="center"
                 android:text="@string/complete"
                 android:textColor="@color/white"

app/src/main/res/layout/dialog_input_remark.xml

@@ -27,7 +27,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 android:textSize="@dimen/sp_18"
-                android:textColor="@color/color_171717"/>
+                android:textColor="@color/white"/>
 
             <ImageView
                 android:id="@+id/iv_dialog_close"
@@ -76,7 +76,7 @@
             android:layout_height="@dimen/dp_38"
             android:background="@color/btn_bg"
             android:textSize="@dimen/sp_16"
-            android:textColor="@color/color_171717"
+            android:textColor="@color/white"
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginRight="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_26"

app/src/main/res/layout/dialog_item_list_take_number.xml

@@ -59,7 +59,7 @@
             android:layout_marginRight="@dimen/dp_21"
             android:background="@drawable/bg_dialog_btn_one_night"
             android:text="@string/commit"
-            android:textColor="@color/color_171717" />
+            android:textColor="@color/white" />
     </android.support.v7.widget.LinearLayoutCompat>
 
 

app/src/main/res/layout/dialog_select_format.xml → app/src/main/res/layout/dialog_select_format_tow.xml

@@ -144,7 +144,7 @@
                     android:layout_height="match_parent"
                     android:background="@color/btn_bg"
                     android:text="@string/add_menu"
-                    android:textColor="@color/color_171717"
+                    android:textColor="@color/white"
                     android:textSize="@dimen/sp_17"
                     android:visibility="gone" />
             </FrameLayout>

app/src/main/res/layout/item_food_list.xml

@@ -50,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/dp_13"
                     android:text="已完成"
-                    android:textColor="@color/font_A4A4A4"
+                    android:textColor="@color/btn_bg"
                     android:textSize="@dimen/sp_14" />
             </LinearLayout>
 

app/src/main/res/layout/item_my_queue_tow.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/dp_10"
-    android:layout_marginTop="@dimen/dp_10"
-    android:layout_marginRight="@dimen/dp_10"
-    android:paddingBottom="@dimen/dp_16"
-    android:background="@mipmap/pic_my_line_up_bg_2">
-
-    <TextView
-        android:id="@+id/tv_queue_title"
-        android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_16"
-        android:text="汉拿山烤肉餐厅"
-        android:textColor="@color/color14"
-        android:textSize="@dimen/sp_16"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_10"
+        android:paddingBottom="@dimen/dp_16"
+        android:elevation="@dimen/dp_1"
+        android:layout_marginBottom="@dimen/dp_1">
 
-    <TextView
-        android:id="@+id/tv_queue_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_11"
-        android:text="@string/queue_number_show"
-        android:textColor="@color/color33"
-        android:textSize="@dimen/sp_14"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
+        <TextView
+            android:id="@+id/tv_queue_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_16"
+            android:text="汉拿山烤肉餐厅"
+            android:textColor="@color/color14"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"/>
 
-    <TextView
-        android:id="@+id/tv_queue_number_tow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="B03"
-        android:textColor="@color/btn_bg"
-        android:textSize="@dimen/sp_17"
-        app:layout_constraintBaseline_toBaselineOf="@id/tv_queue_number"
-        app:layout_constraintLeft_toRightOf="@id/tv_queue_number"
-        app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
+        <TextView
+            android:id="@+id/tv_queue_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_11"
+            android:text="@string/queue_number_show"
+            android:textColor="@color/color33"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
 
-    <TextView
-        android:id="@+id/tv_table_specs"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="中桌（2-4人）"
-        android:textColor="@color/color33"
-        android:textSize="@dimen/sp_14"
-        android:layout_marginLeft="@dimen/dp_15"
-        app:layout_constraintBaseline_toBaselineOf="@id/tv_queue_number_tow"
-        app:layout_constraintLeft_toRightOf="@id/tv_queue_number_tow"
-        app:layout_constraintTop_toBottomOf="@id/tv_queue_title"  />
+        <TextView
+            android:id="@+id/tv_queue_number_tow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="B03"
+            android:textColor="@color/btn_bg"
+            android:textSize="@dimen/sp_17"
+            app:layout_constraintBaseline_toBaselineOf="@id/tv_queue_number"
+            app:layout_constraintLeft_toRightOf="@id/tv_queue_number"
+            app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
+
+        <TextView
+            android:id="@+id/tv_table_specs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="中桌（2-4人）"
+            android:textColor="@color/color33"
+            android:textSize="@dimen/sp_14"
+            android:layout_marginLeft="@dimen/dp_15"
+            app:layout_constraintBaseline_toBaselineOf="@id/tv_queue_number_tow"
+            app:layout_constraintLeft_toRightOf="@id/tv_queue_number_tow"
+            app:layout_constraintTop_toBottomOf="@id/tv_queue_title"  />
+
+        <cn.dankal.basiclib.widget.AdaptTextView
+            android:id="@+id/tv_queue_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="排队成功"
+            android:textColor="@color/btn_bg"
+            android:textSize="@dimen/sp_14"
+            android:maxLines="1"
+            android:layout_marginLeft="@dimen/dp_15"
+            app:layout_constraintBaseline_toBaselineOf="@id/tv_queue_number_tow"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toRightOf="@id/tv_table_specs"
+            app:layout_constrainedWidth="true"
+            android:layout_marginRight="@dimen/dp_12"
+            app:layout_constraintTop_toBottomOf="@id/tv_queue_title"  />
 
-    <cn.dankal.basiclib.widget.AdaptTextView
-        android:id="@+id/tv_queue_state"
+
+    </android.support.constraint.ConstraintLayout>
+
+    <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="排队成功"
-        android:textColor="@color/btn_bg"
-        android:textSize="@dimen/sp_14"
-        android:maxLines="1"
-        android:layout_marginLeft="@dimen/dp_15"
-        app:layout_constraintBaseline_toBaselineOf="@id/tv_queue_number_tow"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/tv_table_specs"
-        app:layout_constrainedWidth="true"
-        android:layout_marginRight="@dimen/dp_12"
-        app:layout_constraintTop_toBottomOf="@id/tv_queue_title"  />
-
+        android:layout_gravity="right"
+        android:layout_marginTop="@dimen/dp_6"
+        android:layout_marginRight="@dimen/dp_20"
+        android:src="@mipmap/ic_ding"/>
+</FrameLayout>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/item_shop_details.xml

@@ -68,7 +68,7 @@
                 android:paddingRight="@dimen/dp_9"
                 android:paddingBottom="@dimen/dp_5"
                 android:text="@string/selection_of_specifications"
-                android:textColor="@color/color00"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_12" />
         </LinearLayout>