merger

Author: geeklx

.idea/gradle.xml

@@ -0,0 +1 @@
+/build

.idea/modules.xml

@@ -0,0 +1,6 @@
+apply plugin: 'java'
+
+dependencies {
+    targetCompatibility = '1.7'
+    sourceCompatibility = '1.7'
+}

glinlibrary/.gitignore

@@ -0,0 +1,30 @@
+package com.example.glinlibrary;
+
+/**
+ * Created by Pengliang on 2016/9/2.
+ */
+public class TestCode {
+    public static void main(String[] args) {
+
+      /*  int freezeByte = 0x01;
+        int coolByte = 0x02;
+        int smartByte = 0x04;
+        int cleanByte = 0x08;
+
+        byte a = (byte) (freezeByte | cleanByte);
+
+        System.out.println(String.format("%02x",a));*/
+
+        printbyte(getHexByteFrom10(38));
+
+    }
+
+
+    public static byte getHexByteFrom10(int i) {
+        return (byte) Integer.parseInt(Integer.toHexString(i), 16);
+    }
+
+    public static void printbyte(byte a){
+        System.out.println(String.format("%02x",a));
+    }
+}

glinlibrary/build.gradle

@@ -308,6 +308,7 @@ dependencies {
 
 
     compile project(':glin')
+    compile project(':glinlibrary')
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.alibaba:fastjson:1.2.17'
     compile 'com.squareup.okio:okio:1.9.0'

glinlibrary/src/main/java/com/example/glinlibrary/TestCode.java

@@ -4,6 +4,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.example.p034_greendao_sqlite.application.DemoApplication;
 import com.example.p034_greendao_sqlite.domain.User;
@@ -96,20 +97,41 @@ private void queryData() {
 
     //增
     private void insertData(int i) {
-        User insertData = new User((long)i, "geek", "100", "男", "100");
+        User insertData = new User(null, i + "", "geek", "100", "男", "100");
         mUserDao.insert(insertData);
     }
 
     //改
     private void updateData(int i) {
-        User updateData = new User((long) i, "geek1", "101", "女", "101");
-        mUserDao.update(updateData);
+//        User updateData = new User(null, i + "", "geek1", "101", "女", "101");
+//        User updateData = new User((long) i, "geek1", "101", "女", "101");
+//        mUserDao.update(updateData);
+
+        User user = mUserDao.queryBuilder()
+                .where(UserDao.Properties.Userid.eq(i + "")/*, UserDao.Properties.Name.like("%90%")*/).build().unique();
+        if (user == null) {
+            Toast.makeText(MainActivity.this, "用户不存在!", Toast.LENGTH_SHORT).show();
+        } else {
+            user.setUserid(i + "");
+            user.setName("geek1");
+            user.setAge("101");
+            user.setSex("女");
+            user.setSalary("101");
+            mUserDao.update(user);
+        }
     }
 
     //删
 
     private void deleteData(int id) {
-        mUserDao.deleteByKey((long) id);
+        User user = mUserDao.queryBuilder().where(UserDao.Properties.Userid.eq(id + "")).build().unique();
+        if (user == null) {
+            Toast.makeText(MainActivity.this, "用户不存在", Toast.LENGTH_SHORT).show();
+        } else {
+            mUserDao.deleteByKey(user.getId());
+        }
+//        User updateData = new User((long) i, "geek1", "101", "女", "101");
+//        mUserDao.deleteByKey((long) id);
     }
 
     //删全部

p010_recycleviewall/build.gradle

@@ -12,6 +12,7 @@
 public class User {
     @Id
     private Long id;
+    private String userid;
     private String name;
     private String age;
     private String sex;
@@ -46,9 +47,17 @@ public Long getId() {
     public void setId(Long id) {
         this.id = id;
     }
-    @Generated(hash = 1281958717)
-    public User(Long id, String name, String age, String sex, String salary) {
+    public String getUserid() {
+        return this.userid;
+    }
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+    @Generated(hash = 364037205)
+    public User(Long id, String userid, String name, String age, String sex,
+            String salary) {
         this.id = id;
+        this.userid = userid;
         this.name = name;
         this.age = age;
         this.sex = sex;

p034_greendao_sqlite/src/main/java/com/example/p034_greendao_sqlite/MainActivity.java

@@ -25,10 +25,11 @@ public class UserDao extends AbstractDao<User, Long> {
     */
     public static class Properties {
         public final static Property Id = new Property(0, Long.class, "id", true, "_id");
-        public final static Property Name = new Property(1, String.class, "name", false, "NAME");
-        public final static Property Age = new Property(2, String.class, "age", false, "AGE");
-        public final static Property Sex = new Property(3, String.class, "sex", false, "SEX");
-        public final static Property Salary = new Property(4, String.class, "salary", false, "SALARY");
+        public final static Property Userid = new Property(1, String.class, "userid", false, "USERID");
+        public final static Property Name = new Property(2, String.class, "name", false, "NAME");
+        public final static Property Age = new Property(3, String.class, "age", false, "AGE");
+        public final static Property Sex = new Property(4, String.class, "sex", false, "SEX");
+        public final static Property Salary = new Property(5, String.class, "salary", false, "SALARY");
     };
 
 
@@ -45,10 +46,11 @@ public static void createTable(Database db, boolean ifNotExists) {
         String constraint = ifNotExists? "IF NOT EXISTS ": "";
         db.execSQL("CREATE TABLE " + constraint + "\"USER\" (" + //
                 "\"_id\" INTEGER PRIMARY KEY ," + // 0: id
-                "\"NAME\" TEXT," + // 1: name
-                "\"AGE\" TEXT," + // 2: age
-                "\"SEX\" TEXT," + // 3: sex
-                "\"SALARY\" TEXT);"); // 4: salary
+                "\"USERID\" TEXT," + // 1: userid
+                "\"NAME\" TEXT," + // 2: name
+                "\"AGE\" TEXT," + // 3: age
+                "\"SEX\" TEXT," + // 4: sex
+                "\"SALARY\" TEXT);"); // 5: salary
     }
 
     /** Drops the underlying database table. */
@@ -66,24 +68,29 @@ protected final void bindValues(DatabaseStatement stmt, User entity) {
             stmt.bindLong(1, id);
         }
 
+        String userid = entity.getUserid();
+        if (userid != null) {
+            stmt.bindString(2, userid);
+        }
+ 
         String name = entity.getName();
         if (name != null) {
-            stmt.bindString(2, name);
+            stmt.bindString(3, name);
         }
 
         String age = entity.getAge();
         if (age != null) {
-            stmt.bindString(3, age);
+            stmt.bindString(4, age);
         }
 
         String sex = entity.getSex();
         if (sex != null) {
-            stmt.bindString(4, sex);
+            stmt.bindString(5, sex);
         }
 
         String salary = entity.getSalary();
         if (salary != null) {
-            stmt.bindString(5, salary);
+            stmt.bindString(6, salary);
         }
     }
 
@@ -96,24 +103,29 @@ protected final void bindValues(SQLiteStatement stmt, User entity) {
             stmt.bindLong(1, id);
         }
 
+        String userid = entity.getUserid();
+        if (userid != null) {
+            stmt.bindString(2, userid);
+        }
+ 
         String name = entity.getName();
         if (name != null) {
-            stmt.bindString(2, name);
+            stmt.bindString(3, name);
         }
 
         String age = entity.getAge();
         if (age != null) {
-            stmt.bindString(3, age);
+            stmt.bindString(4, age);
         }
 
         String sex = entity.getSex();
         if (sex != null) {
-            stmt.bindString(4, sex);
+            stmt.bindString(5, sex);
         }
 
         String salary = entity.getSalary();
         if (salary != null) {
-            stmt.bindString(5, salary);
+            stmt.bindString(6, salary);
         }
     }
 
@@ -126,21 +138,23 @@ public Long readKey(Cursor cursor, int offset) {
     public User readEntity(Cursor cursor, int offset) {
         User entity = new User( //
             cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id
-            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // name
-            cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // age
-            cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // sex
-            cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4) // salary
+            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // userid
+            cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // name
+            cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // age
+            cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // sex
+            cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5) // salary
         );
         return entity;
     }
 
     @Override
     public void readEntity(Cursor cursor, User entity, int offset) {
         entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0));
-        entity.setName(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
-        entity.setAge(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
-        entity.setSex(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
-        entity.setSalary(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4));
+        entity.setUserid(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
+        entity.setName(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
+        entity.setAge(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
+        entity.setSex(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4));
+        entity.setSalary(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5));
      }
 
     @Override

p034_greendao_sqlite/src/main/java/com/example/p034_greendao_sqlite/domain/User.java

@@ -0,0 +1 @@
+/build

p034_greendao_sqlite/src/main/java/com/example/p034_greendao_sqlite/greendao/UserDao.java

@@ -0,0 +1,37 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
+    defaultConfig {
+        applicationId "com.example.shining.p036_tablayoutdemo"
+        minSdkVersion 21
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+
+    testCompile 'junit:junit:4.12'
+}

p036_tablayoutdemo/.gitignore

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in E:\Andriod\adt-bundle-windows-x86_64-20140702\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

p036_tablayoutdemo/build.gradle

@@ -0,0 +1,26 @@
+package com.example.shining.p036_tablayoutdemo;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.example.shining.p036_tablayoutdemo", appContext.getPackageName());
+    }
+}