fixed query

unreal0 · unreal0 · commit 09c6b8a5d977 · 2018-11-12T14:43:13.000+08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,19 @@
+{
+  // 使用 IntelliSense 了解相关属性。
+  // 悬停以查看现有属性的描述。
+  // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Flutter",
+      "type": "dart",
+      "request": "launch",
+      "program": "example/lib/main.dart"
+    },
+    {
+      "name": "Flutter",
+      "request": "launch",
+      "type": "dart"
+    }
+  ]
+}
diff --git a/example/android/.project b/example/android/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/example/android/.settings/org.eclipse.buildship.core.prefs b/example/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/example/android/app/.classpath b/example/android/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/example/android/app/.project b/example/android/app/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/example/android/app/.settings/org.eclipse.buildship.core.prefs b/example/android/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -24,10 +34,10 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.flutterpluginexample"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -46,6 +56,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    // implementation "com.android.support:appcompat-v7:27.1.0"
 }
+// apply plugin: 'com.google.gms.google-services'
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -5,14 +5,16 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.google.gms:google-services:4.0.1'
     }
 }
 
 allprojects {
     repositories {
         google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }
 
@@ -27,3 +29,14 @@ subprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+subprojects {
+    project.configurations.all {
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'com.android.support'
+                    && !details.requested.name.contains('multidex') ) {
+                details.useVersion "26.1.0"
+            }
+        }
+    }
+}
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/android/gradlew b/example/android/gradlew
diff --git a/example/lib/application_constants.dart b/example/lib/application_constants.dart
@@ -1,6 +1,6 @@
 abstract class ApplicationConstants {
-  static const String APP_NAME = "";
-  static const String PARSE_APPLICATION_ID = "";
-  static const String PARSE_MASTER_KEY = "";
-  static const String PARSE_SERVER_URL = "";
-}
+  static const String APP_NAME = "MyApp";
+  static const String PARSE_APPLICATION_ID = "myAppId";
+  static const String PARSE_MASTER_KEY = "123456";
+  static const String PARSE_SERVER_URL = "http://118.24.162.252:2018/parse";
+}
diff --git a/example/lib/diet_plan.dart b/example/lib/diet_plan.dart
@@ -12,32 +12,32 @@ class DietPlan extends ParseObject {
   num fat;
   num status;
 
-  static const String DIET_PLAN = 'Diet_Plans';
-  static const String NAME = 'Name';
-  static const String DESCRIPTION = 'Description';
-  static const String PROTEIN = 'Protein';
-  static const String CARBS = 'Carbs';
-  static const String FAT = 'Fat';
-  static const String STATUS = 'Status';
+  static const String DIET_PLAN = 'post';
+  static const String NAME = 'title';
+  // static const String DESCRIPTION = 'text';
+  // static const String PROTEIN = 'Protein';
+  // static const String CARBS = 'Carbs';
+  // static const String FAT = 'Fat';
+  // static const String STATUS = 'Status';
 
   @override
   dynamic fromJson(Map<String, dynamic> objectData) {
     this.name = objectData[NAME];
-    this.description = objectData[DESCRIPTION];
-    this.protein = objectData[PROTEIN];
-    this.carbs = objectData[CARBS];
-    this.fat = objectData[FAT];
-    this.status = objectData[STATUS];
+    // this.description = objectData[DESCRIPTION];
+    // this.protein = objectData[PROTEIN];
+    // this.carbs = objectData[CARBS];
+    // this.fat = objectData[FAT];
+    // this.status = objectData[STATUS];
     return this;
   }
 
   Map<String, dynamic> toJson() => {
         NAME: name,
-        DESCRIPTION: description,
-        PROTEIN: protein,
-        CARBS: carbs,
-        FAT: fat,
-        STATUS: status,
+        // DESCRIPTION: description,
+        // PROTEIN: protein,
+        // CARBS: carbs,
+        // FAT: fat,
+        // STATUS: status,
       };
 
   @override
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -20,42 +20,50 @@ class _MyAppState extends State<MyApp> {
   void initState() {
     super.initState();
     initParse();
-    getAllItems();
-    getSingleItem();
-    //query();
-    //queryByContainedIn();
-    initUser();
+    // getAllItems();
+    // getSingleItem();
+    query();
+    // queryByContainedIn();
+    // initUser();
   }
 
   Future<void> initParse() async {
-
     // Initialize parse
-    Parse().initialize(
-        ApplicationConstants.PARSE_APPLICATION_ID,
+    Parse().initialize(ApplicationConstants.PARSE_APPLICATION_ID,
         ApplicationConstants.PARSE_SERVER_URL,
         masterKey: ApplicationConstants.PARSE_MASTER_KEY);
   }
 
   void getAllItems() {
     DietPlan().getAll().then((response) {
-      if (response.success){
-
+      if (response.success) {
         for (var plan in response.result) {
-          print(ApplicationConstants.APP_NAME + ": " + (plan as DietPlan).name);
+          if ((plan as DietPlan).name != null) {
+            print(ApplicationConstants.APP_NAME +
+                ": ${DietPlan.DIET_PLAN}------ " +
+                (plan as DietPlan).name);
+          } else {
+            print(ApplicationConstants.APP_NAME +
+                ": ${DietPlan.DIET_PLAN}---${(plan as DietPlan).objectId}--- null");
+          }
         }
-
       } else {
-        print(ApplicationConstants.APP_NAME + ": " + response.exception.message);
+        print(
+            ApplicationConstants.APP_NAME + ": " + response.exception.message);
       }
     });
   }
 
   void getSingleItem() {
-    DietPlan().get('R5EonpUDWy').then((response) {
-      if (response.success){
-        print(ApplicationConstants.APP_NAME + ": " + (response.result as DietPlan).toString());
+    DietPlan().get('2pNUgv1CKA').then((response) {
+      if (response.success) {
+        print("response.result: ${response.result}");
+        print(ApplicationConstants.APP_NAME +
+            ":: ${DietPlan.DIET_PLAN}---${(response.result as DietPlan).objectId}---  " +
+            (response.result as DietPlan).toString());
       } else {
-        print(ApplicationConstants.APP_NAME + ": " + response.exception.message);
+        print(
+            ApplicationConstants.APP_NAME + ": " + response.exception.message);
       }
     });
   }
@@ -65,13 +73,18 @@ class _MyAppState extends State<MyApp> {
     QueryBuilder()
       ..object = DietPlan()
       ..field = DietPlan.NAME
-      ..equals = ['Paleo']
-      ..query().then((response){
-
-        if (response.success){
-          print(ApplicationConstants.APP_NAME + ": " + ((response.result as List<ParseObject>)[0] as DietPlan).toString());
+      ..equals = ['fff444']
+      ..query().then((response) {
+        if (response.success) {
+          print(ApplicationConstants.APP_NAME +
+              "::: ${DietPlan.DIET_PLAN}---${((response.result as List<ParseObject>)[0] as DietPlan).name}---  " +
+              ((response.result as List<ParseObject>)[0] as DietPlan)
+                  .objectId
+                  .toString());
         } else {
-          print(ApplicationConstants.APP_NAME + ": " + response.exception.message);
+          print(ApplicationConstants.APP_NAME +
+              ": " +
+              response.exception.message);
         }
       });
   }
@@ -81,22 +94,31 @@ class _MyAppState extends State<MyApp> {
     QueryBuilder()
       ..object = DietPlan()
       ..field = DietPlan.NAME
-      ..contains = ['Diet']
-      ..query().then((response){
-
-        if (response.success){
-          print(ApplicationConstants.APP_NAME + ": " + ((response.result as List<ParseObject>)[0] as DietPlan).toString());
+      ..containedIn = ['dfg']
+      ..query().then((response) {
+        if (response.success) {
+          print("queryByContainedIn-result: ${response.result}");
+          print(ApplicationConstants.APP_NAME +
+              ": " +
+              ((response.result as List<ParseObject>).length > 0
+                  ? ((response.result as List<ParseObject>)[0] as DietPlan)
+                      .toString()
+                  : ""));
         } else {
-          print(ApplicationConstants.APP_NAME + ": " + response.exception.message);
+          print(ApplicationConstants.APP_NAME +
+              ": " +
+              response.exception.message);
         }
       });
   }
 
   Future<void> initUser() async {
-   User().createNewUser("TestFlutter", "TestPassword123", "TestEmail@Email.com");
+    User()
+        .createNewUser("TestFlutter", "TestPassword123", "TestEmail@Email.com");
+    // User().signUp();
 
     User().login().then((val) {
-      print(val);
+      print("val: $val");
     });
   }
 
diff --git a/lib/network/parse_http_client.dart b/lib/network/parse_http_client.dart
@@ -18,6 +18,7 @@ class ParseHTTPClient extends http.BaseClient {
     request.headers['Content-Type'] = 'application/json';
     if (data.masterKey != null)
       request.headers['X-Parse-Master-Key'] = data.masterKey;
+    print("request: $request");
     return _client.send(request);
   }
 }
diff --git a/lib/network/parse_query.dart b/lib/network/parse_query.dart
diff --git a/lib/objects/parse_object.dart b/lib/objects/parse_object.dart
diff --git a/lib/objects/parse_response.dart b/lib/objects/parse_response.dart
diff --git a/lib/objects/parse_user.dart b/lib/objects/parse_user.dart

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=..`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,16 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.1.2'`
	`9`	`+ classpath 'com.google.gms:google-services:4.0.1'`
`9`	`10`	`}`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`allprojects {`
`13`	`14`	`repositories {`
`14`	`15`	`google()`
`15`	`16`	`jcenter()`
	`17`	`+ maven { url "https://jitpack.io" }`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`
`@@ -27,3 +29,14 @@ subprojects {`
`27`	`29`	`task clean(type: Delete) {`
`28`	`30`	`delete rootProject.buildDir`
`29`	`31`	`}`
	`32`	`+`
	`33`	`+subprojects {`
	`34`	`+ project.configurations.all {`
	`35`	`+ resolutionStrategy.eachDependency { details ->`
	`36`	`+ if (details.requested.group == 'com.android.support'`
	`37`	`+ && !details.requested.name.contains('multidex') ) {`
	`38`	`+ details.useVersion "26.1.0"`
	`39`	`+ }`
	`40`	`+ }`
	`41`	`+ }`
	`42`	`+}`