Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,17 @@ proguard/
.idea/

.DS_Store

.gradle

.idea

local.properties

liteorm.iml

library/library.iml
library/build

sample/sample.iml
sample/build
29 changes: 29 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
maven { url 'https://dl.bintray.com/umsdk/release' }
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
maven { url 'https://dl.bintray.com/umsdk/release' }
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
41 changes: 41 additions & 0 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
apply plugin: "com.android.library"

android {
compileSdkVersion rootProject.compileSdkVersion as int
buildToolsVersion rootProject.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.minSdkVersion as int
targetSdkVersion rootProject.targetSdkVersion as int
versionCode 1
versionName "1.0"
}

buildTypes {
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
}

release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

android.sourceSets {
main.jniLibs.srcDirs = ["libs/jniLibs"]
}
}

dependencies {
api fileTree(dir: "libs", include: ["*.jar"])

api "net.zetetic:android-database-sqlcipher:4.4.0"
implementation "androidx.sqlite:sqlite:2.1.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
android:versionCode="28"
android:versionName="1.9.1">

<uses-sdk android:minSdkVersion="3"/>

<!-- db文件在sd卡:在SDCard中创建与删除文件权限 -->
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<!-- db文件在sd卡:往SDCard写入数据权限 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@
package com.litesuits.orm;

import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteClosable;
import android.database.sqlite.SQLiteDatabase;
import com.litesuits.orm.db.DataBase;
import com.litesuits.orm.db.DataBaseConfig;
import com.litesuits.orm.db.TableManager;
import com.litesuits.orm.db.annotation.Check;
import com.litesuits.orm.db.assit.*;
import com.litesuits.orm.db.impl.CascadeSQLiteImpl;
import com.litesuits.orm.db.impl.SingleSQLiteImpl;
Expand All @@ -32,6 +28,10 @@
import com.litesuits.orm.db.utils.FieldUtil;
import com.litesuits.orm.log.OrmLog;

import net.sqlcipher.Cursor;
import net.sqlcipher.database.SQLiteClosable;
import net.sqlcipher.database.SQLiteDatabase;

import java.io.File;
import java.io.FileFilter;
import java.util.*;
Expand Down Expand Up @@ -332,7 +332,7 @@ public DataBaseConfig getDataBaseConfig() {
@Override
public SQLiteDatabase openOrCreateDatabase(String path, SQLiteDatabase.CursorFactory factory) {
path = mConfig.context.getDatabasePath(mConfig.dbName).getPath();
return SQLiteDatabase.openOrCreateDatabase(path, factory);
return SQLiteDatabase.openOrCreateDatabase(path, "pwd", factory);
}

@Override
Expand Down
17 changes: 17 additions & 0 deletions library/src/main/java/com/litesuits/orm/LiteOrmApplication.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.litesuits.orm;

import android.content.Context;

import net.sqlcipher.database.SQLiteDatabase;

public class LiteOrmApplication {
private static String mPwd;
public static void init(Context context, String pwd){
SQLiteDatabase.loadLibs(context);
mPwd = pwd;
}

public static String getPwd() {
return mPwd;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.litesuits.orm.db;

import android.database.sqlite.SQLiteDatabase;
import com.litesuits.orm.db.assit.QueryBuilder;
import com.litesuits.orm.db.assit.WhereBuilder;
import com.litesuits.orm.db.assit.SQLStatement;
Expand All @@ -24,6 +23,8 @@
import com.litesuits.orm.db.model.ConflictAlgorithm;
import com.litesuits.orm.db.model.RelationKey;

import net.sqlcipher.database.SQLiteDatabase;

import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
*/
package com.litesuits.orm.db;


import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import com.litesuits.orm.db.annotation.Column;
import com.litesuits.orm.db.annotation.Mapping;
import com.litesuits.orm.db.annotation.PrimaryKey;
Expand All @@ -33,6 +30,9 @@
import com.litesuits.orm.db.utils.FieldUtil;
import com.litesuits.orm.log.OrmLog;

import net.sqlcipher.Cursor;
import net.sqlcipher.database.SQLiteDatabase;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.litesuits.orm.db.assit;

import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import com.litesuits.orm.log.OrmLog;

import net.sqlcipher.Cursor;
import net.sqlcipher.database.SQLiteDatabase;

/**
* 辅助查询
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package com.litesuits.orm.db.assit;

import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteStatement;
import android.os.Build;
import android.util.Log;
import com.litesuits.orm.db.TableManager;
import com.litesuits.orm.db.assit.Querier.CursorParser;
import com.litesuits.orm.db.model.ColumnsValue;
Expand All @@ -17,6 +13,10 @@
import com.litesuits.orm.db.utils.FieldUtil;
import com.litesuits.orm.log.OrmLog;

import net.sqlcipher.Cursor;
import net.sqlcipher.database.SQLiteDatabase;
import net.sqlcipher.database.SQLiteStatement;

import java.io.IOException;
import java.io.Serializable;
import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.litesuits.orm.db.assit;

import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDatabase.CursorFactory;
import android.database.sqlite.SQLiteOpenHelper;

import com.litesuits.orm.LiteOrmApplication;

import net.sqlcipher.database.SQLiteDatabase;
import net.sqlcipher.database.SQLiteOpenHelper;

/**
* SQLite辅助类
Expand All @@ -19,8 +21,8 @@ public static interface OnUpdateListener {

private OnUpdateListener onUpdateListener;

public SQLiteHelper(Context context, String name, CursorFactory factory, int version,
OnUpdateListener onUpdateListener) {
public SQLiteHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version,
OnUpdateListener onUpdateListener) {
super(context, name, factory, version);
this.onUpdateListener = onUpdateListener;
}
Expand All @@ -35,4 +37,11 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
}
}

public synchronized SQLiteDatabase getWritableDatabase() {
return super.getWritableDatabase(LiteOrmApplication.getPwd());
}

public synchronized SQLiteDatabase getReadableDatabase() {
return super.getReadableDatabase(LiteOrmApplication.getPwd());
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.litesuits.orm.db.assit;

import android.database.sqlite.SQLiteDatabase;
import com.litesuits.orm.log.OrmLog;

import net.sqlcipher.database.SQLiteDatabase;

/**
* 辅助事务
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.litesuits.orm.db.impl;

import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import com.litesuits.orm.LiteOrm;
import com.litesuits.orm.db.DataBaseConfig;
import com.litesuits.orm.db.TableManager;
Expand All @@ -12,7 +10,9 @@
import com.litesuits.orm.db.utils.DataUtil;
import com.litesuits.orm.db.utils.FieldUtil;

import java.io.IOException;
import net.sqlcipher.Cursor;
import net.sqlcipher.database.SQLiteDatabase;

import java.lang.reflect.Field;
import java.util.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.litesuits.orm.db.impl;

import android.database.sqlite.SQLiteDatabase;
import com.litesuits.orm.LiteOrm;
import com.litesuits.orm.db.DataBaseConfig;
import com.litesuits.orm.db.TableManager;
Expand All @@ -9,6 +8,8 @@
import com.litesuits.orm.db.model.ConflictAlgorithm;
import com.litesuits.orm.db.model.EntityTable;

import net.sqlcipher.database.SQLiteDatabase;

import java.util.ArrayList;
import java.util.Collection;

Expand Down
4 changes: 0 additions & 4 deletions sample/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

37 changes: 37 additions & 0 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apply plugin: "com.android.application"

android {
compileSdkVersion rootProject.compileSdkVersion as int
buildToolsVersion rootProject.buildToolsVersion

defaultConfig {
applicationId "com.litesuits.orm.samples"
minSdkVersion rootProject.minSdkVersion as int
targetSdkVersion rootProject.targetSdkVersion as int
versionCode rootProject.versionCode as int
versionName rootProject.versionName
}

buildTypes {
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", "proguard-fresco.pro"
}

release {
minifyEnabled true
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", "proguard-fresco.pro"
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

}

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation project(path: ":library")
}
Binary file removed sample/libs/lite-orm-1.9.1.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
android:versionCode="1"
android:versionName="1.0">

<uses-sdk
android:minSdkVersion="5"/>

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:name="com.litesuits.orm.Application"
android:theme="@style/AppTheme">

<activity
Expand Down
10 changes: 10 additions & 0 deletions sample/src/main/java/com/litesuits/orm/Application.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.litesuits.orm;

public class Application extends android.app.Application {
@Override
public void onCreate() {
super.onCreate();

LiteOrmApplication.init(this, "pwd");
}
}
Loading