Skip to content

更新框架2.2.0 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hylthink merged 2 commits into from
Jun 23, 2016
Merged

更新框架2.2.0 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
488c889
框架2.1.3第一轮提测
hylthink Apr 14, 2016
9e58966
更新框架2.2.0
lixiecheng Jun 21, 2016
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
Binary file modified proj.android/libs/arm64-v8a/libPluginProtocol.so
View file
Open in desktop
Binary file not shown.
Binary file modified proj.android/libs/armeabi-v7a/libPluginProtocol.so
View file
Open in desktop
Binary file not shown.
Binary file modified proj.android/libs/armeabi/libPluginProtocol.so
View file
Open in desktop
Binary file not shown.
Binary file modified proj.android/libs/libPluginProtocolForJava_fat.jar
View file
Open in desktop
Binary file not shown.
Binary file modified proj.android/libs/x86/libPluginProtocol.so
View file
Open in desktop
Binary file not shown.
44 changes: 42 additions & 2 deletions proj.android/src/com/anysdk/sample/Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.util.Log;

import com.anysdk.framework.AdsWrapper;
import com.anysdk.framework.java.AnySDKAdTracking;
import com.anysdk.framework.java.AnySDKAds;
import com.anysdk.framework.java.AnySDKAnalytics;
import com.anysdk.framework.java.AnySDKCrash;
Expand All @@ -24,7 +25,7 @@ public static void onClick(String tag, String title) {
if (tag.equals("user")) {
AnySDKUser user = AnySDKUser.getInstance();
if (title.equals("login")) {
user.login();
user.login(DataManager.getInstance().getAccountInfo());
} else if (title.equals("isLogined")) {
Log.d("isLogined", user.isLogined() + "");
} else if (title.equals("getUserID")) {
Expand Down Expand Up @@ -204,7 +205,32 @@ public static void onClick(String tag, String title) {
} else if (title.equals("leaveBreadcrumb")) {
crash.leaveBreadcrumb("leaveBreadcrumb");
}
}else if (tag.equals("Banner")) {
} else if (tag.equals("adtracking")) {
AnySDKAdTracking adTracking = AnySDKAdTracking.getInstance();
if (title.equals("onRegister")) {
adTracking.onRegister("userid");
} else if (title.equals("onLogin")) {
adTracking.onLogin(DataManager.getInstance().getLoginInfo());
}else if (title.equals("onPay")) {
adTracking.onPay(DataManager.getInstance().getPayInfo());
} else if (title.equals("trackEvent")) {
adTracking.trackEvent("event_1");
adTracking.trackEvent("event_2");
adTracking.trackEvent("onCustEvent1");
adTracking.trackEvent("onCustEvent2");
}else if (title.equals("onCreateRole")) {
adTracking.trackEvent("onCreateRole", DataManager.getInstance().getLoginInfo());
adTracking.callFunction("onCreateRole", new AnySDKParam(DataManager.getInstance().getLoginInfo()));
}else if (title.equals("onLevelUp")) {
adTracking.trackEvent("onLevelUp", DataManager.getInstance().getLoginInfo());
adTracking.callFunction("onLevelUp", new AnySDKParam(DataManager.getInstance().getLoginInfo()));

}else if (title.equals("onStartToPay")) {
adTracking.trackEvent("onStartToPay", DataManager.getInstance().getPayInfo());
adTracking.callFunction("onStartToPay", new AnySDKParam(DataManager.getInstance().getPayInfo()));

}
}else if (tag.equals("Banner")) {
aboutAds(AdsWrapper.AD_TYPE_BANNER,title);
}else if (tag.equals("FullScreen")) {
aboutAds(AdsWrapper.AD_TYPE_FULLSCREEN,title);
Expand Down Expand Up @@ -325,6 +351,20 @@ public static List<String> extendRECFunction(List<String> source) {
return source;
}

public static List<String> extendAdTrackingFunction(List<String> source) {
AnySDKAdTracking instance = AnySDKAdTracking.getInstance();
if (instance.isFunctionSupported("onCreateRole")) {
source.add("onCreateRole");
}
if (instance.isFunctionSupported("onLevelUp")) {
source.add("onLevelUp");
}
if (instance.isFunctionSupported("onStartToPay")) {
source.add("onStartToPay");
}
return source;
}

public static void aboutAds(int type, String title){
AnySDKAds ads = AnySDKAds.getInstance();
if (title.equals("preloadAds1")) {
Expand Down
33 changes: 33 additions & 0 deletions proj.android/src/com/anysdk/sample/DataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import java.util.HashMap;
import java.util.Map;

import android.text.format.Time;

import com.anysdk.framework.AnalyticsWrapper;
import com.anysdk.framework.java.AnySDK;
import com.anysdk.framework.java.AnySDKAnalytics;
Expand All @@ -27,6 +29,11 @@ public class DataManager {
private Map<String, String> mTaskStartInfo = null;
private Map<String, String> mTaskFailInfo = null;

private Map<String, String> mLoginInfo = null;

private Map<String, String> mPayInfo = null;



private static DataManager instance;
public static DataManager getInstance(){
Expand Down Expand Up @@ -140,6 +147,24 @@ private void initData()
mTaskFailInfo.put("Task_Id", "123456");
mTaskFailInfo.put("Fail_Reason", "test");

mLoginInfo = new HashMap<String, String>();
mLoginInfo.put("User_Id", "123456");
mLoginInfo.put("Role_Id", "test");
mLoginInfo.put("Role_Name", "test");
mLoginInfo.put("Level", "10");

mPayInfo = new HashMap<String, String>();
mPayInfo.put("User_Id", "123456");
mPayInfo.put("Order_Id", Time.getCurrentTimezone());
mPayInfo.put("Currency_Amount", "5");
mPayInfo.put("Currency_Type", "CNY");
mPayInfo.put("Payment_Type", "test");
mPayInfo.put("Payment_Time", Time.getCurrentTimezone());
mPayInfo.put("Item_Id", "1");
mPayInfo.put("Item_Count", "1");




}
public Map<String, String> getRoleInfo() {
Expand Down Expand Up @@ -202,6 +227,14 @@ public Map<String, String> getTaskFailInfo() {
return mTaskFailInfo;
}

public Map<String, String> getLoginInfo() {
return mLoginInfo;
}

public Map<String, String> getPayInfo() {
return mPayInfo;
}

public ArrayList<String> getTagInfo() {
return mTagInfo;
}
Expand Down
17 changes: 14 additions & 3 deletions proj.android/src/com/anysdk/sample/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public class MainActivity extends Activity {

private String[] mainStrings = new String[] { "User System", "IAP System",
"Share System", "Social System", "Ads System", "Analytics System",
"Push System", "Crash System", "REC System"};
"Push System", "Crash System", "REC System", "AdTracking System"};

private String[] userStrings = new String[] { "return", "login",
"isLogined", "getUserID" };
Expand Down Expand Up @@ -102,6 +102,9 @@ public class MainActivity extends Activity {

private String[] recStrings = new String[] { "return", "startRecording",
"stopRecording", "share" };

private String[] adTrackingStrings = new String[] { "return", "onRegister",
"onLogin", "onPay", "trackEvent"};

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -151,7 +154,12 @@ public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
updataData("crash",tagString);
} else if (titleString.equals("REC System")) {
updataData("rec",tagString);
}
}else if (titleString.equals("AdTracking System")) {
updataData("adtracking",tagString);
}
else if (titleString.equals("AdTracking System")) {
updataData("adtracking",tagString);
}
adapter.notifyDataSetChanged();
mainListView.setAdapter(adapter);
} else if(tagString.equals("ads")){
Expand Down Expand Up @@ -205,7 +213,10 @@ private void updataData(String tag,String last) {
} else if (tag.equals("rec")) {
list.addAll(Arrays.asList(recStrings));
list = Controller.extendRECFunction(list);
} else if (tag.equals("Banner")) {
} else if (tag.equals("adtracking")) {
list.addAll(Arrays.asList(adTrackingStrings));
list = Controller.extendAdTrackingFunction(list);
} else if (tag.equals("Banner")) {
list.addAll(Arrays.asList(adsFuntionStrings));
} else if (tag.equals("FullScreen")) {
list.addAll(Arrays.asList(adsFuntionStrings));
Expand Down