diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ac2981d..3e00980 100755 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -9,13 +9,16 @@ <option name="modules"> <set> <option value="$PROJECT_DIR$" /> + <option value="$PROJECT_DIR$/IDCardLib" /> <option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/baseSDK" /> <option value="$PROJECT_DIR$/locationComponent" /> <option value="$PROJECT_DIR$/messageCenter" /> <option value="$PROJECT_DIR$/orderCenter" /> + <option value="$PROJECT_DIR$/pickerview" /> <option value="$PROJECT_DIR$/provider" /> <option value="$PROJECT_DIR$/userCenter" /> + <option value="$PROJECT_DIR$/wheelview" /> </set> </option> <option name="resolveModulePerSourceSet" value="false" /> diff --git a/.idea/modules.xml b/.idea/modules.xml index d26d47d..3f632da 100755 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,14 +2,17 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> + <module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" /> <module fileurl="file://$PROJECT_DIR$/dayu.iml" filepath="$PROJECT_DIR$/dayu.iml" /> <module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" /> <module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/orderCenter/orderCenter.iml" filepath="$PROJECT_DIR$/orderCenter/orderCenter.iml" /> + <module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" /> <module fileurl="file://$PROJECT_DIR$/provider/provider.iml" filepath="$PROJECT_DIR$/provider/provider.iml" /> <module fileurl="file://$PROJECT_DIR$/userCenter/userCenter.iml" filepath="$PROJECT_DIR$/userCenter/userCenter.iml" /> + <module fileurl="file://$PROJECT_DIR$/wheelview/wheelview.iml" filepath="$PROJECT_DIR$/wheelview/wheelview.iml" /> </modules> </component> </project> \ No newline at end of file diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 6a81d8c..a6f9cbc 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/app_1.3_release.apk b/app/release/app_1.3_release.apk deleted file mode 100644 index ec3e231..0000000 Binary files a/app/release/app_1.3_release.apk and /dev/null differ diff --git a/app/release/output.json b/app/release/output.json index f17a23c..eba85a0 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":8},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}] \ No newline at end of file diff --git a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java index cf31d10..612eb8d 100755 --- a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java +++ b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java @@ -33,7 +33,6 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa @Override public int getLayoutId() { return R.layout.activity_initialize_main; - } @Override