> 77 
         jumpToSelectedSession( presenter.createNewSession());
74 78 
     }
75 79

+ 6 - 0
app/src/main/java/ai/pai/lensman/session/SessionActivity.java
Datei anzeigen 

@@ -15,6 +15,7 @@ import android.widget.Toast;
15 15
16 16 
 import com.android.common.utils.LogHelper;
17 17 
 import com.android.common.utils.NetworkUtil;
18 
+import com.umeng.analytics.MobclickAgent;
18 19
19 20 
 import java.io.File;
20 21 
 
@@ -25,6 +26,7 @@ import ai.pai.lensman.bean.PhotoBean;
25 26 
 import ai.pai.lensman.bean.SessionBean;
26 27 
 import ai.pai.lensman.printer.PrinterSettingActivity;
27 28 
 import ai.pai.lensman.qrcode.QRCaptureActivity;
29 
+import ai.pai.lensman.utils.UmengEvent;
28 30 
 import butterknife.BindView;
29 31 
 import butterknife.ButterKnife;
30 32 
 import butterknife.OnClick;
 
@@ -111,12 +113,15 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie
111 113
112 114 
     @OnClick(R.id.iv_scan)
113 115 
     void scanToFetchSessionQR(){
116 
+        MobclickAgent.onEvent(this, UmengEvent.session_scan_qr_btn_click);
114 117 
         Intent intent = new Intent(SessionActivity.this, QRCaptureActivity.class);
115 118 
         startActivityForResult(intent, JOIN_REQUEST_CODE);
119 
+
116 120 
     }
117 121
118 122 
     @OnClick(R.id.iv_qrcode)
119 123 
     void showQRCodeForSession(){
124 
+        MobclickAgent.onEvent(this, UmengEvent.session_view_qr_btn_click);
120 125 
         Intent intent = new Intent(this,SessionQRCodeActivity.class);
121 126 
         intent.putExtra("qrcode",sessionBean.sessionId);
122 127 
         startActivity(intent);
 
@@ -130,6 +135,7 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie
130 135
131 136 
     @OnClick(R.id.btn_session_complete)
132 137 
     void onSessionComplete(){
138 
+        MobclickAgent.onEvent(this, UmengEvent.session_finish_btn_click);
133 139 
         presenter.stop();
134 140 
         finish();
135 141 
     }

+ 14 - 0
app/src/main/java/ai/pai/lensman/utils/UmengEvent.java
Datei anzeigen 

@@ -0,0 +1,14 @@
1 
+package ai.pai.lensman.utils;
2 
+
3 
+/**
4 
+ * Created by chengzhenyu on 2017/3/5.
5 
+ */
6 
+
7 
+public class UmengEvent {
8 
+    public static final String home_add_session_btn_click = "home_add_session_btn_click";
9 
+    public static final String home_brief_btn_click ="home_brief_btn_click";
10 
+    public static final String session_finish_btn_click = "session_finish_btn_click";
11 
+    public static final String brief_setting_btn_click ="brief_setting_btn_click";
12 
+    public static final String session_scan_qr_btn_click = "session_scan_qr_btn_click";
13 
+    public static final String session_view_qr_btn_click ="session_view_qr_btn_click";
14 
+}

+ 10 - 0
app/src/main/res/layout/activity_about_us.xml
Datei anzeigen 

@@ -49,6 +49,16 @@
49 49 
             android:textColor="@color/dark_grey"
50 50 
             android:layout_marginLeft="10dp"/>
51 51
52 
+        <TextView
53 
+            android:id="@+id/tv_cur_version"
54 
+            android:layout_width="0dp"
55 
+            android:layout_weight="1"
56 
+            android:layout_height="wrap_content"
57 
+            android:textSize="14sp"
58 
+            android:gravity="right"
59 
+            android:textColor="@color/grey"
60 
+            android:layout_marginRight="10dp"/>
61 
+
52 62 
         <ImageView
53 63 
             android:layout_width="wrap_content"
54 64 
             android:layout_height="wrap_content"

+ 1 - 1
build.gradle
Datei anzeigen 

@@ -5,7 +5,7 @@ buildscript {
5 5 
         jcenter()
6 6 
     }
7 7 
     dependencies {
8 
-        classpath 'com.android.tools.build:gradle:2.2.3'
8 
+        classpath 'com.android.tools.build:gradle:2.3.0'
9 9 
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
10 10 
         // NOTE: Do not place your application dependencies here; they belong
11 11 
         // in the individual module build.gradle files

+ 2 - 2
common/build.gradle
Datei anzeigen 

@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
2 2
3 3 
 android {
4 4 
     compileSdkVersion 24
5 
-    buildToolsVersion "24.0.3"
5 
+    buildToolsVersion "25.0.2"
6 6
7 7 
     defaultConfig {
8 8 
         minSdkVersion 14
9 
-        targetSdkVersion 23
9 
+        targetSdkVersion 21
10 10 
         versionCode 1
11 11 
         versionName "1.0"
12 12 
     }

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties
Datei anzeigen 

@@ -1,6 +1,6 @@
1 
-#Thu Aug 18 08:08:09 CST 2016
1 
+#Sun Mar 05 10:19:46 CST 2017
2 2 
 distributionBase=GRADLE_USER_HOME
3 3 
 distributionPath=wrapper/dists
4 4 
 zipStoreBase=GRADLE_USER_HOME
5 5 
 zipStorePath=wrapper/dists
6 
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6 
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

+ 2 - 2
views/build.gradle
Datei anzeigen 

@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
2 2
3 3 
 android {
4 4 
     compileSdkVersion 24
5 
-    buildToolsVersion "24.0.3"
5 
+    buildToolsVersion "25.0.2"
6 6
7 7 
     defaultConfig {
8 8 
         minSdkVersion 14
9 
-        targetSdkVersion 23
9 
+        targetSdkVersion 21
10 10 
         versionCode 1
11 11 
         versionName "1.0"
12 12 
     }

Kodo/kodo - Gogs: Go Git Service
Home Erkunden Hilfe
Registrieren Anmelden
Kodo
/
kodo
Beobachten 2
Markieren 0
Fork 0
Issues 0 Pull-Anforderung 0 Commits 269 Veröffentlichungen 0

269 Commits (36e351b13d148119bc4a91c6e950a9dabcf6be71)

Author SHA1 Nachricht Datum
  Brightcells 36e351b13d Update errno vor 10 Jahren
  Brightcells e47798ebe0 Return group_photos group by session_id vor 10 Jahren
  Brightcells 8e7c94e2ef Add parameter group_id for lensman_photo_upload_api vor 10 Jahren
  Brightcells 9fd8002931 Update requirements.txt vor 10 Jahren
  khb 3e9d466d86 Update requirements.txt vor 10 Jahren
  Brightcells f40ea0a414 Fix call session_join_api after group_quit_api vor 10 Jahren
  Brightcells e06dc10006 Make join session group by scan group qrcode fetch group photos initio vor 10 Jahren
  Brightcells c7abce172a Rename field name vor 10 Jahren
  Brightcells da19301800 Update set_brief_info after origin photo upload vor 10 Jahren
  Brightcells 84e77dd54d Fix duplicate delete for api /l/origin_upload vor 10 Jahren
  Brightcells e249360c0c Add freeze_balance for lensman/user vor 10 Jahren
  Brightcells c2b994efc2 Update requirements.txt vor 10 Jahren
  Brightcells d79857ed0e lensman balance decr when origin deleted & update redis vor 10 Jahren
  Brightcells e4c95c78c7 tstrip vor 10 Jahren
  Brightcells dd00e3b1a9 add api online_api vor 10 Jahren
  Brightcells 7f27864ab9 update requirements.txt vor 10 Jahren
  Brightcells 4a8f8ff2b8 update requirements.txt vor 10 Jahren
  Brightcells b7b3dcffc3 restructure haggle_price vor 10 Jahren
  Brightcells 972ab1e3b8 add StreamHandler vor 10 Jahren
  Brightcells 5b678f8553 fix bug: price be negative vor 10 Jahren
  Brightcells 4ff159f583 update error code vor 10 Jahren
  Brightcells ac85066b8b set status_code default 200 vor 10 Jahren
  Brightcells c761b9cf4c add page price vor 10 Jahren
  Brightcells ba8098eaae fix bug: get_group_users_info error when not in redis vor 10 Jahren
  Brightcells 9b5e3da7fb fix group user quit bug vor 10 Jahren
  Brightcells 994db88de2 return price_fixed in lensman_brief_api vor 10 Jahren
  Brightcells 23f00aedae fix bug: ValueError: invalid literal for int() with base 10: 'origin' vor 10 Jahren
  Brightcells 07da1c3383 add order_id for lensman_origin_photo_upload_api & check multi paid vor 10 Jahren
  Brightcells 7691894d4b filter pay_status=OrderInfo.PAID for api lensman_origin_wanted_api vor 10 Jahren
  Brightcells 684b876a38 price_fixed store in redis & update api lensman_photo_price vor 10 Jahren
  Brightcells 4fdd237863 add api price_fix vor 10 Jahren
  Brightcells a45976ca99 update brief returns vor 10 Jahren
  Brightcells 1ee8b5e061 add group_photo_info for lensdata vor 10 Jahren
  Brightcells 4ff27acb27 @property vor 10 Jahren
  Brightcells 27d3ec8fb1 add src for LatestAppInfo/SplashInfo vor 10 Jahren
  Brightcells c12df969e1 add origin_expired_stamps vor 10 Jahren
  Brightcells b65f84e502 Duplicate entry vor 10 Jahren
  Brightcells 232b73e861 lensman upload photo in lensman_app should not see in user_app vor 10 Jahren
  Brightcells 6199c8f7ad add api lensman_origin_wanted_api/lensman_origin_photo_upload_api vor 10 Jahren
  Brightcells ac69b15c9b update requirements.txt vor 10 Jahren
  Brightcells 963dca9588 update requirements.txt vor 10 Jahren
  Brightcells b6b46b302b update requirements.txt vor 10 Jahren
  Brightcells b68c637678 update redis-extensions vor 10 Jahren
  Brightcells 561491e543 fix bug: AttributeError: 'module' object has no attribute 'ConnectionPool' vor 10 Jahren
  Brightcells ae502c940d fix bug: AttributeError: 'module' object has no attribute 'StrictRedis' vor 10 Jahren
  Brightcells 48995aae69 update redis_extensions —— class StrictRedisExtensions(StrictRedis) vor 10 Jahren
  Brightcells 05faf3c5db update lensman_brief_api vor 10 Jahren
  Brightcells 8c384ff52e remove to_lid vor 10 Jahren
  Brightcells 8468d9f9c5 remove to_lid vor 10 Jahren
  Brightcells f7b627af9b update lensman_brief_api vor 10 Jahren