add formate enevt

f707dbab · zhaihuitao · c03be16a · f707dbab · f707dbab
Commit f707dbab authored Aug 20, 2020 by zhaihuitao
Hide whitespace changes
Inline Side-by-side

Showing with 68 additions and 40 deletions

workspace.xml .idea/workspace.xml +41 -40

params.py config/prod/params.py +27 -0

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ChangeListManager">
-    <list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="">
+    <list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="add install enevt">
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/prod/params.py" afterPath="$PROJECT_DIR$/config/prod/params.py" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
@@ -106,8 +107,8 @@
      <file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/config/envcfg.py">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="589">
-              <caret line="70" column="1" lean-forward="false" selection-start-line="70" selection-start-column="1" selection-end-line="70" selection-end-column="1" />
+            <state relative-caret-position="-403">
+              <caret line="12" column="6" lean-forward="false" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
              <folding>
                <element signature="e#98#120#0" expanded="true" />
              </folding>
@@ -119,17 +120,17 @@
        <entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="270">
-              <caret line="22" column="19" lean-forward="true" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
+              <caret line="22" column="19" lean-forward="false" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="params.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="params.py" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/config/prod/params.py">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="649">
-              <caret line="146" column="1" lean-forward="false" selection-start-line="146" selection-start-column="1" selection-end-line="146" selection-end-column="1" />
+            <state relative-caret-position="197">
+              <caret line="149" column="12" lean-forward="false" selection-start-line="149" selection-start-column="12" selection-end-line="149" selection-end-column="12" />
              <folding>
                <element signature="e#97#108#0" expanded="true" />
              </folding>
@@ -137,11 +138,11 @@
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="test_login.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="test_login.py" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="270">
-              <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
+              <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
              <folding>
                <element signature="e#101#116#0" expanded="true" />
              </folding>
@@ -183,12 +184,12 @@
        <option value="$PROJECT_DIR$/testcase/android_events/installEvent.py" />
        <option value="$PROJECT_DIR$/config/envcfg.py" />
        <option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
-        <option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
        <option value="$PROJECT_DIR$/common/randomUtil.py" />
        <option value="$PROJECT_DIR$/testcase/android_events/test_login.py" />
-        <option value="$PROJECT_DIR$/config/prod/params.py" />
        <option value="$PROJECT_DIR$/testcase/android_click/click.py" />
        <option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
+        <option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
+        <option value="$PROJECT_DIR$/config/prod/params.py" />
      </list>
    </option>
  </component>
@@ -200,8 +201,9 @@
  </component>
  <component name="JupyterTrust" id="011944ba-9639-4fe0-bbde-101a097f7a7c" />
  <component name="ProjectFrameBounds">
+    <option name="y" value="23" />
    <option name="width" value="1280" />
-    <option name="height" value="800" />
+    <option name="height" value="724" />
  </component>
  <component name="ProjectId" id="1flIcHzsT2O9ij8EUJcOPBG4r2Y" />
  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -346,8 +348,7 @@
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="vcs.Git" />
-    <property name="FullScreen" value="true" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
  </component>
  <component name="RecentsManager">
    <key name="MoveFile.RECENT_KEYS">
@@ -898,7 +899,7 @@
    </todo-panel>
  </component>
  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
+    <frame x="0" y="23" width="1280" height="724" extended-state="0" />
    <editor active="true" />
    <layout>
      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26979" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1289,26 +1290,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/config/prod/params.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="649">
-          <caret line="146" column="1" lean-forward="false" selection-start-line="146" selection-start-column="1" selection-end-line="146" selection-end-column="1" />
-          <folding>
-            <element signature="e#97#108#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/envcfg.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="589">
-          <caret line="70" column="1" lean-forward="false" selection-start-line="70" selection-start-column="1" selection-end-line="70" selection-end-column="1" />
-          <folding>
-            <element signature="e#98#120#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/data/prod.yaml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="225">
@@ -1353,20 +1334,40 @@
        </state>
      </provider>
    </entry>
+    <entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
+          <folding>
+            <element signature="e#101#116#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/envcfg.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-403">
+          <caret line="12" column="6" lean-forward="false" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
+          <folding>
+            <element signature="e#98#120#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
    <entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="270">
-          <caret line="22" column="19" lean-forward="true" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
+          <caret line="22" column="19" lean-forward="false" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py">
+    <entry file="file://$PROJECT_DIR$/config/prod/params.py">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
+        <state relative-caret-position="197">
+          <caret line="149" column="12" lean-forward="false" selection-start-line="149" selection-start-column="12" selection-end-line="149" selection-end-column="12" />
          <folding>
-            <element signature="e#101#116#0" expanded="true" />
+            <element signature="e#97#108#0" expanded="true" />
          </folding>
        </state>
      </provider>

--- a/config/prod/params.py
+++ b/config/prod/params.py
@@ -144,4 +144,30 @@ params_login = {
            # 'when': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())),
            # 'ds': ds,
            'who': 'lxx_test'
+}
+
+params_formate = {
+            "appid": appkey,
+            "context": {
+                "_campaignid": 'default',
+                "_deviceid": i,
+                "_imei": i,
+                # "_imei2":i,
+                # "_oaid":i,
+                # "_meid":i,
+                "_androidid": "2342312",
+                "_ip": IP,
+                '_manufacturer': manufacturer,
+                '_ryos': ryos,
+                '_rydevicetype': rydevicetype,
+                '_network': network,
+                '_resolution': resolution,
+                '_op': op,
+                "_lib_version": lv,
+                '_timestamp': "aaa"
+            },
+            # 'when': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())),
+            # time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))
+            # 'ds': ds,
+            'who': 'lxx_test'
 }
\ No newline at end of file