ssa

abenkdh · Mar 2, 2020 · 8005b35 · 8005b35
1 parent 20ff50a
commit 8005b35
Show file tree

Hide file tree

Showing 21 changed files with 371 additions and 476 deletions.
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
diff --git a/.gradle/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/app.iml b/app/app.iml
@@ -125,5 +125,6 @@
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
     <orderEntry type="module" module-name="bsjson" />
+    <orderEntry type="module" module-name="bsjson" />
   </component>
 </module>
diff --git a/app/src/main/java/com/benkkstudio/bsjsonsample/MainActivity.java b/app/src/main/java/com/benkkstudio/bsjsonsample/MainActivity.java
@@ -3,29 +3,37 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
-import android.util.Log;
-import android.widget.Toast;
+import android.view.View;
 
-import com.benkkstudio.bsjson.API;
-import com.benkkstudio.bsjson.BSJsonV2;
-import com.benkkstudio.bsjson.Interface.BSJsonV2Listener;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
-import org.json.JSONObject;
+import com.benkkstudio.bsjson.BSJson;
+import com.benkkstudio.bsjson.BSObject;
 
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        JsonObject jsObj = (JsonObject) new Gson().toJsonTree(new API());
-        jsObj.addProperty("method_name", "settings");
-        new BSJsonV2.Builder(this)
-                .setObject(jsObj)
-                .setPurchaseCode("52394c52-11f0-4c5a-91d7-7c2c7c054fdb")
+        new BSJson.initializing()
+                .withSecret("6d1fa25b-d168-489f-96cf-d657d8fd207c")
+                .enableLogging(true);
+        load();
+        findViewById(R.id.button).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                load();
+            }
+        });
+
+    }
+
+    private void load(){
+        BSObject bsObject = new BSObject();
+        bsObject.addProperty("method_name", "settings");
+        new BSJson.Builder(this)
+                .setObject(bsObject.getProperty())
                 .setServer("https://benkkstudio.xyz/bsvideostatus/api.php")
+                .setMethod(BSJson.METHOD_POST)
                 .load();
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -5,5 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <Button
+        android:id="@+id/button"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="load"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/bsjson/src/main/java/com/benkkstudio/bsjson/API.java b/bsjson/src/main/java/com/benkkstudio/bsjson/API.java