Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8828 from unknownbrackets/reporting

Browse source 
Show a confirmation screen after feedback submit
This commit is contained in:
Henrik Rydgård 2016-06-26 11:39:47 +02:00 • committed by GitHub
commit d25cc72021
4 changed files with 67 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Core/Reporting.cpp
View file

@ -80,7 +80,7 @@ namespace Reporting
static int payloadBufferPos = 0; static int payloadBufferPos = 0;
// Returns the full host (e.g. report.ppsspp.org:80.) // Returns the full host (e.g. report.ppsspp.org:80.)
inline std::string ServerHost() std::string ServerHost()
{ {
if (g_Config.sReportHost.compare("default") == 0) if (g_Config.sReportHost.compare("default") == 0)
return ""; return "";
@ -257,10 +257,17 @@ namespace Reporting
return logOnceUsed.insert(identifier).second; return logOnceUsed.insert(identifier).second;
} }
void AddGameInfo(UrlEncoder &postdata) std::string CurrentGameID()
{ {
// TODO: Maybe ParamSFOData shouldn't include nulls in std::strings? Don't work to break savedata, though... // TODO: Maybe ParamSFOData shouldn't include nulls in std::strings? Don't work to break savedata, though...
postdata.Add("game", StripTrailingNull(g_paramSFO.GetValueString("DISC_ID")) + "_" + StripTrailingNull(g_paramSFO.GetValueString("DISC_VERSION"))); const std::string disc_id = StripTrailingNull(g_paramSFO.GetValueString("DISC_ID"));
const std::string disc_version = StripTrailingNull(g_paramSFO.GetValueString("DISC_VERSION"));
return disc_id + "_" + disc_version;
}
void AddGameInfo(UrlEncoder &postdata)
{
postdata.Add("game", CurrentGameID());
postdata.Add("game_title", StripTrailingNull(g_paramSFO.GetValueString("TITLE"))); postdata.Add("game_title", StripTrailingNull(g_paramSFO.GetValueString("TITLE")));
postdata.Add("sdkver", sceKernelGetCompiledSdkVersion()); postdata.Add("sdkver", sceKernelGetCompiledSdkVersion());
} }

6
Core/Reporting.h
View file

@ -74,4 +74,10 @@ namespace Reporting
// Returns true if that identifier has not been logged yet. // Returns true if that identifier has not been logged yet.
bool ShouldLogOnce(const char *identifier); bool ShouldLogOnce(const char *identifier);
// Return the currently active host (or blank if not active.)
std::string ServerHost();
// Return the current game id.
std::string CurrentGameID();
} }

41
UI/ReportScreen.cpp
View file

@ -283,10 +283,49 @@ EventReturn ReportScreen::HandleSubmit(EventParams &e) {
std::string filename = includeScreenshot_ ? screenshotFilename_ : ""; std::string filename = includeScreenshot_ ? screenshotFilename_ : "";
Reporting::ReportCompatibility(compat, graphics_ + 1, speed_ + 1, gameplay_ + 1, filename); Reporting::ReportCompatibility(compat, graphics_ + 1, speed_ + 1, gameplay_ + 1, filename);
screenManager()->finishDialog(this, DR_OK); screenManager()->finishDialog(this, DR_OK);
screenManager()->push(new ReportFinishScreen(gamePath_));
return EVENT_DONE; return EVENT_DONE;
} }
EventReturn ReportScreen::HandleBrowser(EventParams &e) { EventReturn ReportScreen::HandleBrowser(EventParams &e) {
LaunchBrowser("http://report.ppsspp.org/"); const std::string url = "http://" + Reporting::ServerHost() + "/";
LaunchBrowser(url.c_str());
return EVENT_DONE;
}
ReportFinishScreen::ReportFinishScreen(const std::string &gamePath)
: UIScreenWithGameBackground(gamePath) {
}
void ReportFinishScreen::CreateViews() {
I18NCategory *rp = GetI18NCategory("Reporting");
I18NCategory *di = GetI18NCategory("Dialog");
Margins actionMenuMargins(0, 20, 15, 0);
Margins contentMargins(0, 20, 5, 5);
ViewGroup *leftColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT, 0.4f, contentMargins));
LinearLayout *leftColumnItems = new LinearLayout(ORIENT_VERTICAL, new LayoutParams(WRAP_CONTENT, FILL_PARENT));
ViewGroup *rightColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(300, FILL_PARENT, actionMenuMargins));
LinearLayout *rightColumnItems = new LinearLayout(ORIENT_VERTICAL);
leftColumnItems->Add(new TextView(rp->T("FeedbackThanks", "Thanks for your feedback."), new LinearLayoutParams(Margins(12, 5, 0, 5))));
rightColumnItems->SetSpacing(0.0f);
rightColumnItems->Add(new Choice(rp->T("View Feedback")))->OnClick.Handle(this, &ReportFinishScreen::HandleViewFeedback);
rightColumnItems->Add(new Spacer(25.0));
rightColumnItems->Add(new Choice(di->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
root_ = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT, 1.0f));
root_->Add(leftColumn);
root_->Add(rightColumn);
leftColumn->Add(leftColumnItems);
rightColumn->Add(rightColumnItems);
}
UI::EventReturn ReportFinishScreen::HandleViewFeedback(UI::EventParams &e) {
const std::string url = "http://" + Reporting::ServerHost() + "/game/" + Reporting::CurrentGameID();
LaunchBrowser(url.c_str());
return EVENT_DONE; return EVENT_DONE;
} }

10
UI/ReportScreen.h
View file

@ -49,3 +49,13 @@ protected:
bool ratingEnabled_; bool ratingEnabled_;
bool includeScreenshot_; bool includeScreenshot_;
}; };
class ReportFinishScreen : public UIScreenWithGameBackground {
public:
ReportFinishScreen(const std::string &gamePath);
protected:
void CreateViews() override;
UI::EventReturn HandleViewFeedback(UI::EventParams &e);
};